Merge upstream r432:

pam_end() already contains a NULL check, and it is not unreasonable to
call it with a NULL pamh in a cleanup / error-handling situation.  Remove
OPENPAM_NONNULL, which may cause gcc to optimize away the NULL check.

This fixes a potential NULL pointer dereference in error-handling code
in passwd(1).
This commit is contained in:
Dag-Erling Smørgrav 2010-03-22 11:00:57 +00:00
commit c399daf6d0
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=205441

View File

@ -72,8 +72,7 @@ pam_close_session(pam_handle_t *_pamh,
int
pam_end(pam_handle_t *_pamh,
int _status)
OPENPAM_NONNULL((1));
int _status);
int
pam_get_data(const pam_handle_t *_pamh,