svn commit: r205440 - vendor/openpam/dist/include/security

[Dag-Erling Smorgrav]

Author: des
Date: Mon Mar 22 10:58:16 2010
New Revision: 205440
URL: http://svn.freebsd.org/changeset/base/205440

Log:
  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.

Modified:
  vendor/openpam/dist/include/security/pam_appl.h

Modified: vendor/openpam/dist/include/security/pam_appl.h
==============================================================================
--- vendor/openpam/dist/include/security/pam_appl.h	Mon Mar 22 10:11:59 2010	(r205439)
+++ vendor/openpam/dist/include/security/pam_appl.h	Mon Mar 22 10:58:16 2010	(r205440)
@@ -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,