diff options
| author | Dag-Erling Smørgrav <des@FreeBSD.org> | 2010-03-22 10:58:16 +0000 |
|---|---|---|
| committer | Dag-Erling Smørgrav <des@FreeBSD.org> | 2010-03-22 10:58:16 +0000 |
| commit | 1e3356fe614cc18b3a424448b3b02eead9368c2e (patch) | |
| tree | f78ffd6a73fe31476433101872b45ea631e2edfc | |
| parent | 65b8d0b5ad22cc3a65acf03ff14d04ea520044ba (diff) | |
| download | src-1e3356fe614cc18b3a424448b3b02eead9368c2e.tar.gz src-1e3356fe614cc18b3a424448b3b02eead9368c2e.zip | |
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.
Notes
Notes:
svn path=/vendor/openpam/dist/; revision=205440
| -rw-r--r-- | include/security/pam_appl.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/security/pam_appl.h b/include/security/pam_appl.h index 8316c68ab02a..131c2f9a9887 100644 --- a/include/security/pam_appl.h +++ b/include/security/pam_appl.h @@ -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, |