From 1e3356fe614cc18b3a424448b3b02eead9368c2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dag-Erling=20Sm=C3=B8rgrav?= Date: Mon, 22 Mar 2010 10:58:16 +0000 Subject: [PATCH] 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. --- include/security/pam_appl.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/include/security/pam_appl.h b/include/security/pam_appl.h index 8316c68ab02..131c2f9a988 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,