Vendor import of OpenPAM Hydrangea.

9 files changed, 224 insertions, 123 deletions

diff --git a/contrib/openpam/include/security/Makefile.am b/contrib/openpam/include/security/Makefile.am
index 1dc346d..f31b3a0 100644
--- a/contrib/openpam/include/security/Makefile.am
+++ b/contrib/openpam/include/security/Makefile.am
@@ -1,9 +1,10 @@
-# $P4: //depot/projects/openpam/include/security/Makefile.am#3 $
+# $Id: Makefile.am 405 2007-12-19 11:38:27Z des $
 
 openpamdir = $(includedir)/security
 
 openpam_HEADERS = \
 	openpam.h \
+	openpam_attr.h \
 	openpam_version.h \
 	pam_appl.h \
 	pam_constants.h \
diff --git a/contrib/openpam/include/security/Makefile.in b/contrib/openpam/include/security/Makefile.in
index 4db4a87..e6af56a 100644
--- a/contrib/openpam/include/security/Makefile.in
+++ b/contrib/openpam/include/security/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004  Free Software Foundation, Inc.
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,7 +14,7 @@
 
 @SET_MAKE@
 
-# $P4: //depot/projects/openpam/include/security/Makefile.am#3 $
+# $Id: Makefile.am 405 2007-12-19 11:38:27Z des $
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
@@ -46,11 +46,17 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(mkdir_p)
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 SOURCES =
 DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
 am__installdirs = "$(DESTDIR)$(openpamdir)"
 openpamHEADERS_INSTALL = $(INSTALL_HEADER)
 HEADERS = $(openpam_HEADERS)
@@ -88,6 +94,7 @@ EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
+GREP = @GREP@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -110,20 +117,20 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
-WITH_PAM_SU_FALSE = @WITH_PAM_SU_FALSE@
-WITH_PAM_SU_TRUE = @WITH_PAM_SU_TRUE@
+WITH_DOC_FALSE = @WITH_DOC_FALSE@
+WITH_DOC_TRUE = @WITH_DOC_TRUE@
 WITH_PAM_UNIX_FALSE = @WITH_PAM_UNIX_FALSE@
 WITH_PAM_UNIX_TRUE = @WITH_PAM_UNIX_TRUE@
-ac_ct_AR = @ac_ct_AR@
+WITH_SU_FALSE = @WITH_SU_FALSE@
+WITH_SU_TRUE = @WITH_SU_TRUE@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -131,6 +138,8 @@ am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -138,23 +147,30 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
@@ -166,6 +182,7 @@ target_vendor = @target_vendor@
 openpamdir = $(includedir)/security
 openpam_HEADERS = \
 	openpam.h \
+	openpam_attr.h \
 	openpam_version.h \
 	pam_appl.h \
 	pam_constants.h \
@@ -219,7 +236,7 @@ install-openpamHEADERS: $(openpam_HEADERS)
 	test -z "$(openpamdir)" || $(mkdir_p) "$(DESTDIR)$(openpamdir)"
 	@list='$(openpam_HEADERS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+	  f=$(am__strip_dir) \
 	  echo " $(openpamHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(openpamdir)/$$f'"; \
 	  $(openpamHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(openpamdir)/$$f"; \
 	done
@@ -227,7 +244,7 @@ install-openpamHEADERS: $(openpam_HEADERS)
 uninstall-openpamHEADERS:
 	@$(NORMAL_UNINSTALL)
 	@list='$(openpam_HEADERS)'; for p in $$list; do \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+	  f=$(am__strip_dir) \
 	  echo " rm -f '$(DESTDIR)$(openpamdir)/$$f'"; \
 	  rm -f "$(DESTDIR)$(openpamdir)/$$f"; \
 	done
@@ -333,7 +350,7 @@ mostlyclean-generic:
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
diff --git a/contrib/openpam/include/security/openpam.h b/contrib/openpam/include/security/openpam.h
index 55b237e..3361d62 100644
--- a/contrib/openpam/include/security/openpam.h
+++ b/contrib/openpam/include/security/openpam.h
@@ -1,5 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
+ * Copyright (c) 2004-2007 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
@@ -31,17 +32,19 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/openpam/include/security/openpam.h#28 $
+ * $Id: openpam.h 408 2007-12-21 11:36:24Z des $
  */
 
-#ifndef _SECURITY_OPENPAM_H_INCLUDED
-#define _SECURITY_OPENPAM_H_INCLUDED
+#ifndef SECURITY_OPENPAM_H_INCLUDED
+#define SECURITY_OPENPAM_H_INCLUDED
 
 /*
  * Annoying but necessary header pollution
  */
 #include <stdarg.h>
 
+#include <security/openpam_attr.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -53,7 +56,8 @@ struct passwd;
  */
 int
 openpam_borrow_cred(pam_handle_t *_pamh,
-	const struct passwd *_pwd);
+	const struct passwd *_pwd)
+	OPENPAM_NONNULL((1,2));
 
 void
 openpam_free_data(pam_handle_t *_pamh,
@@ -68,7 +72,8 @@ openpam_get_option(pam_handle_t *_pamh,
 	const char *_option);
 
 int
-openpam_restore_cred(pam_handle_t *_pamh);
+openpam_restore_cred(pam_handle_t *_pamh)
+	OPENPAM_NONNULL((1));
 
 int
 openpam_set_option(pam_handle_t *_pamh,
@@ -76,50 +81,64 @@ openpam_set_option(pam_handle_t *_pamh,
 	const char *_value);
 
 int
-pam_error(pam_handle_t *_pamh,
+pam_error(const pam_handle_t *_pamh,
 	const char *_fmt,
-	...);
+	...)
+	OPENPAM_FORMAT ((__printf__, 2, 3))
+	OPENPAM_NONNULL((1,2));
 
 int
 pam_get_authtok(pam_handle_t *_pamh,
 	int _item,
 	const char **_authtok,
-	const char *_prompt);
+	const char *_prompt)
+	OPENPAM_NONNULL((1,3));
 
 int
-pam_info(pam_handle_t *_pamh,
+pam_info(const pam_handle_t *_pamh,
 	const char *_fmt,
-	...);
+	...)
+	OPENPAM_FORMAT ((__printf__, 2, 3))
+	OPENPAM_NONNULL((1,2));
 
 int
-pam_prompt(pam_handle_t *_pamh,
+pam_prompt(const pam_handle_t *_pamh,
 	int _style,
 	char **_resp,
 	const char *_fmt,
-	...);
+	...)
+	OPENPAM_FORMAT ((__printf__, 4, 5))
+	OPENPAM_NONNULL((1,4));
 
 int
 pam_setenv(pam_handle_t *_pamh,
 	const char *_name,
 	const char *_value,
-	int _overwrite);
+	int _overwrite)
+	OPENPAM_NONNULL((1,2,3));
 
 int
-pam_vinfo(pam_handle_t *_pamh,
+pam_vinfo(const pam_handle_t *_pamh,
 	const char *_fmt,
-	va_list _ap);
+	va_list _ap)
+	OPENPAM_FORMAT ((__printf__, 2, 0))
+	OPENPAM_NONNULL((1,2));
 
 int
-pam_verror(pam_handle_t *_pamh,
+pam_verror(const pam_handle_t *_pamh,
 	const char *_fmt,
-	va_list _ap);
+	va_list _ap)
+	OPENPAM_FORMAT ((__printf__, 2, 0))
+	OPENPAM_NONNULL((1,2));
 
 int
-pam_vprompt(pam_handle_t *_pamh,
+pam_vprompt(const pam_handle_t *_pamh,
 	int _style,
 	char **_resp,
 	const char *_fmt,
-	va_list _ap);
+	va_list _ap)
+	OPENPAM_FORMAT ((__printf__, 4, 0))
+	OPENPAM_NONNULL((1,4));
 
 /*
  * Read cooked lines.
@@ -130,7 +149,8 @@ pam_vprompt(pam_handle_t *_pamh,
 char *
 openpam_readline(FILE *_f,
 	int *_lineno,
-	size_t *_lenp);
+	size_t *_lenp)
+	OPENPAM_NONNULL((1));
 #endif
 
 /*
@@ -151,10 +171,8 @@ _openpam_log(int _level,
 	const char *_func,
 	const char *_fmt,
 	...)
-#if defined(__GNUC__)
-	__attribute__((__format__(__printf__, 3, 4)))
-#endif
-	;
+	OPENPAM_FORMAT ((__printf__, 3, 4))
+	OPENPAM_NONNULL((3));
 
 #if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)
 #define openpam_log(lvl, ...) \
@@ -172,7 +190,9 @@ _openpam_log(int _level,
 void
 openpam_log(int _level,
 	const char *_format,
-	...);
+ 	...)
+ 	OPENPAM_FORMAT ((__printf__, 2, 3))
+	OPENPAM_NONNULL((2));
 #endif
 
 /*
@@ -217,6 +237,11 @@ PAM_EXTERN int								\
 pam_sm_##type(pam_handle_t *pamh, int flags,				\
     int argc, const char *argv[])					\
 {									\
+									\
+	(void)pamh;							\
+	(void)flags;							\
+	(void)argc;							\
+	(void)argv;							\
 	return (PAM_IGNORE);						\
 }
 
@@ -234,9 +259,6 @@ struct pam_module {
 	char		*path;
 	pam_func_t	 func[PAM_NUM_PRIMITIVES];
 	void		*dlh;
-	int		 refcount;
-	pam_module_t	*prev;
-	pam_module_t	*next;
 };
 
 /*
@@ -244,39 +266,43 @@ struct pam_module {
  */
 #if defined(PAM_SM_AUTH) || defined(PAM_SM_ACCOUNT) || \
 	defined(PAM_SM_SESSION) || defined(PAM_SM_PASSWORD)
-#define LINUX_PAM_MODULE
+# define LINUX_PAM_MODULE
 #endif
+
 #if defined(LINUX_PAM_MODULE) && !defined(PAM_SM_AUTH)
-#define _PAM_SM_AUTHENTICATE	0
-#define _PAM_SM_SETCRED		0
+# define _PAM_SM_AUTHENTICATE	0
+# define _PAM_SM_SETCRED	0
 #else
-#undef PAM_SM_AUTH
-#define PAM_SM_AUTH
-#define _PAM_SM_AUTHENTICATE	pam_sm_authenticate
-#define _PAM_SM_SETCRED		pam_sm_setcred
+# undef PAM_SM_AUTH
+# define PAM_SM_AUTH
+# define _PAM_SM_AUTHENTICATE	pam_sm_authenticate
+# define _PAM_SM_SETCRED	pam_sm_setcred
 #endif
+
 #if defined(LINUX_PAM_MODULE) && !defined(PAM_SM_ACCOUNT)
-#define _PAM_SM_ACCT_MGMT	0
+# define _PAM_SM_ACCT_MGMT	0
 #else
-#undef PAM_SM_ACCOUNT
-#define PAM_SM_ACCOUNT
-#define _PAM_SM_ACCT_MGMT	pam_sm_acct_mgmt
+# undef PAM_SM_ACCOUNT
+# define PAM_SM_ACCOUNT
+# define _PAM_SM_ACCT_MGMT	pam_sm_acct_mgmt
 #endif
+
 #if defined(LINUX_PAM_MODULE) && !defined(PAM_SM_SESSION)
-#define _PAM_SM_OPEN_SESSION	0
-#define _PAM_SM_CLOSE_SESSION	0
+# define _PAM_SM_OPEN_SESSION	0
+# define _PAM_SM_CLOSE_SESSION	0
 #else
-#undef PAM_SM_SESSION
-#define PAM_SM_SESSION
-#define _PAM_SM_OPEN_SESSION	pam_sm_open_session
-#define _PAM_SM_CLOSE_SESSION	pam_sm_close_session
+# undef PAM_SM_SESSION
+# define PAM_SM_SESSION
+# define _PAM_SM_OPEN_SESSION	pam_sm_open_session
+# define _PAM_SM_CLOSE_SESSION	pam_sm_close_session
 #endif
+
 #if defined(LINUX_PAM_MODULE) && !defined(PAM_SM_PASSWORD)
-#define _PAM_SM_CHAUTHTOK	0
+# define _PAM_SM_CHAUTHTOK	0
 #else
-#undef PAM_SM_PASSWORD
-#define PAM_SM_PASSWORD
-#define _PAM_SM_CHAUTHTOK	pam_sm_chauthtok
+# undef PAM_SM_PASSWORD
+# define PAM_SM_PASSWORD
+# define _PAM_SM_CHAUTHTOK	pam_sm_chauthtok
 #endif
 
 /*
@@ -284,33 +310,40 @@ struct pam_module {
  * You are not expected to understand this.
  */
 #if defined(__FreeBSD__)
-#define PAM_SOEXT ".so"
+# define PAM_SOEXT ".so"
 #else
-#ifndef NO_STATIC_MODULES
-#define NO_STATIC_MODULES
-#endif
+# undef NO_STATIC_MODULES
+# define NO_STATIC_MODULES
 #endif
+
 #if defined(__GNUC__) && !defined(__PIC__) && !defined(NO_STATIC_MODULES)
 /* gcc, static linking */
-#include <sys/cdefs.h>
-#include <linker_set.h>
-#define OPENPAM_STATIC_MODULES
-#define PAM_EXTERN static
-#define PAM_MODULE_ENTRY(name)						\
-static char _pam_name[] = name PAM_SOEXT;				\
-static struct pam_module _pam_module = { _pam_name, {			\
-    _PAM_SM_AUTHENTICATE, _PAM_SM_SETCRED, _PAM_SM_ACCT_MGMT,		\
-    _PAM_SM_OPEN_SESSION, _PAM_SM_CLOSE_SESSION, _PAM_SM_CHAUTHTOK },	\
-    NULL, 0, NULL, NULL };						\
-DATA_SET(_openpam_static_modules, _pam_module)
+# include <sys/cdefs.h>
+# include <linker_set.h>
+# define OPENPAM_STATIC_MODULES
+# define PAM_EXTERN static
+# define PAM_MODULE_ENTRY(name)						\
+	static char _pam_name[] = name PAM_SOEXT;			\
+	static struct pam_module _pam_module = {			\
+		.path = _pam_name,					\
+		.func = {						\
+			[PAM_SM_AUTHENTICATE] = _PAM_SM_AUTHENTICATE,	\
+			[PAM_SM_SETCRED] = _PAM_SM_SETCRED,		\
+			[PAM_SM_ACCT_MGMT] = _PAM_SM_ACCT_MGMT,		\
+			[PAM_SM_OPEN_SESSION] = _PAM_SM_OPEN_SESSION,	\
+			[PAM_SM_CLOSE_SESSION] = _PAM_SM_CLOSE_SESSION, \
+			[PAM_SM_CHAUTHTOK] = _PAM_SM_CHAUTHTOK		\
+		},							\
+	};								\
+	DATA_SET(_openpam_static_modules, _pam_module)
 #else
 /* normal case */
-#define PAM_EXTERN
-#define PAM_MODULE_ENTRY(name)
+# define PAM_EXTERN
+# define PAM_MODULE_ENTRY(name)
 #endif
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif
+#endif /* !SECURITY_OPENPAM_H_INCLUDED */
diff --git a/contrib/openpam/include/security/openpam_attr.h b/contrib/openpam/include/security/openpam_attr.h
new file mode 100644
index 0000000..aada5cc
--- /dev/null
+++ b/contrib/openpam/include/security/openpam_attr.h
@@ -0,0 +1,28 @@
+/*
+ * $Id: openpam_attr.h 405 2007-12-19 11:38:27Z des $
+ */
+
+#ifndef SECURITY_PAM_ATTRIBUTES_H_INCLUDED
+#define SECURITY_PAM_ATTRIBUTES_H_INCLUDED
+
+/* GCC attributes */
+#if defined(__GNUC__) && defined(__GNUC_MINOR__) && !defined(__STRICT_ANSI__)
+# define OPENPAM_GNUC_PREREQ(maj, min) \
+        ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
+#else
+# define OPENPAM_GNUC_PREREQ(maj, min) 0
+#endif
+
+#if OPENPAM_GNUC_PREREQ(2,5)
+# define OPENPAM_FORMAT(params) __attribute__((__format__ params))
+#else
+# define OPENPAM_FORMAT(params)
+#endif
+
+#if OPENPAM_GNUC_PREREQ(3,3)
+# define OPENPAM_NONNULL(params) __attribute__((__nonnull__ params))
+#else
+# define OPENPAM_NONNULL(params)
+#endif
+
+#endif /* !SECURITY_PAM_ATTRIBUTES_H_INCLUDED */
diff --git a/contrib/openpam/include/security/openpam_version.h b/contrib/openpam/include/security/openpam_version.h
index b7b3e8e..1a3b153 100644
--- a/contrib/openpam/include/security/openpam_version.h
+++ b/contrib/openpam/include/security/openpam_version.h
@@ -1,5 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
+ * Copyright (c) 2004-2007 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
@@ -31,14 +32,14 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/openpam/include/security/openpam_version.h#14 $
+ * $Id: openpam_version.h 409 2007-12-21 11:38:50Z des $
  */
 
-#ifndef _OPENPAM_VERSION_H_INCLUDED
-#define _OPENPAM_VERSION_H_INCLUDED
+#ifndef SECURITY_OPENPAM_VERSION_H_INCLUDED
+#define SECURITY_OPENPAM_VERSION_H_INCLUDED
 
-#define _OPENPAM
-#define _OPENPAM_VERSION	20050616
-#define _OPENPAM_RELEASE	"Figwort"
+#define OPENPAM
+#define OPENPAM_VERSION	20071221
+#define OPENPAM_RELEASE	"Hydrangea"
 
-#endif
+#endif /* !SECURITY_OPENPAM_VERSION_H_INCLUDED */
diff --git a/contrib/openpam/include/security/pam_appl.h b/contrib/openpam/include/security/pam_appl.h
index d97022e..8316c68 100644
--- a/contrib/openpam/include/security/pam_appl.h
+++ b/contrib/openpam/include/security/pam_appl.h
@@ -1,5 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
+ * Copyright (c) 2004-2007 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
@@ -31,14 +32,15 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/openpam/include/security/pam_appl.h#14 $
+ * $Id: pam_appl.h 408 2007-12-21 11:36:24Z des $
  */
 
-#ifndef _PAM_APPL_H_INCLUDED
-#define _PAM_APPL_H_INCLUDED
+#ifndef SECURITY_PAM_APPL_H_INCLUDED
+#define SECURITY_PAM_APPL_H_INCLUDED
 
 #include <security/pam_types.h>
 #include <security/pam_constants.h>
+#include <security/openpam_attr.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -50,53 +52,65 @@ extern "C" {
 
 int
 pam_acct_mgmt(pam_handle_t *_pamh,
-	int _flags);
+	int _flags)
+	OPENPAM_NONNULL((1));
 
 int
 pam_authenticate(pam_handle_t *_pamh,
-	int _flags);
+	int _flags)
+	OPENPAM_NONNULL((1));
 
 int
 pam_chauthtok(pam_handle_t *_pamh,
-	int _flags);
+	int _flags)
+	OPENPAM_NONNULL((1));
 
 int
 pam_close_session(pam_handle_t *_pamh,
-	int _flags);
+	int _flags)
+	OPENPAM_NONNULL((1));
 
 int
 pam_end(pam_handle_t *_pamh,
-	int _status);
+	int _status)
+	OPENPAM_NONNULL((1));
 
 int
-pam_get_data(pam_handle_t *_pamh,
+pam_get_data(const pam_handle_t *_pamh,
 	const char *_module_data_name,
-	void **_data);
+	const void **_data)
+	OPENPAM_NONNULL((1,2,3));
 
 int
-pam_get_item(pam_handle_t *_pamh,
+pam_get_item(const pam_handle_t *_pamh,
 	int _item_type,
-	const void **_item);
+	const void **_item)
+	OPENPAM_NONNULL((1,3));
 
 int
 pam_get_user(pam_handle_t *_pamh,
 	const char **_user,
-	const char *_prompt);
+	const char *_prompt)
+	OPENPAM_NONNULL((1,2));
 
 const char *
 pam_getenv(pam_handle_t *_pamh,
-	const char *_name);
+	const char *_name)
+	OPENPAM_NONNULL((1,2));
 
 char **
-pam_getenvlist(pam_handle_t *_pamh);
+pam_getenvlist(pam_handle_t *_pamh)
+	OPENPAM_NONNULL((1));
 
 int
 pam_open_session(pam_handle_t *_pamh,
-	int _flags);
+	int _flags)
+	OPENPAM_NONNULL((1));
 
 int
 pam_putenv(pam_handle_t *_pamh,
-	const char *_namevalue);
+	const char *_namevalue)
+	OPENPAM_NONNULL((1,2));
 
 int
 pam_set_data(pam_handle_t *_pamh,
@@ -104,25 +118,29 @@ pam_set_data(pam_handle_t *_pamh,
 	void *_data,
 	void (*_cleanup)(pam_handle_t *_pamh,
 		void *_data,
-		int _pam_end_status));
+		int _pam_end_status))
+	OPENPAM_NONNULL((1,2));
 
 int
 pam_set_item(pam_handle_t *_pamh,
 	int _item_type,
-	const void *_item);
+	const void *_item)
+	OPENPAM_NONNULL((1));
 
 int
 pam_setcred(pam_handle_t *_pamh,
-	int _flags);
+	int _flags)
+	OPENPAM_NONNULL((1));
 
 int
 pam_start(const char *_service,
 	const char *_user,
 	const struct pam_conv *_pam_conv,
-	pam_handle_t **_pamh);
+	pam_handle_t **_pamh)
+	OPENPAM_NONNULL((4));
 
 const char *
-pam_strerror(pam_handle_t *_pamh,
+pam_strerror(const pam_handle_t *_pamh,
 	int _error_number);
 
 /*
@@ -177,4 +195,4 @@ pam_set_mapped_username(pam_handle_t *_pamh,
 }
 #endif
 
-#endif
+#endif /* !SECURITY_PAM_APPL_H_INCLUDED */
diff --git a/contrib/openpam/include/security/pam_constants.h b/contrib/openpam/include/security/pam_constants.h
index f3f8d30..b005c7f 100644
--- a/contrib/openpam/include/security/pam_constants.h
+++ b/contrib/openpam/include/security/pam_constants.h
@@ -1,5 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
+ * Copyright (c) 2004-2007 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
@@ -31,11 +32,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/openpam/include/security/pam_constants.h#22 $
+ * $Id: pam_constants.h 408 2007-12-21 11:36:24Z des $
  */
 
-#ifndef _PAM_CONSTANTS_H_INCLUDED
-#define _PAM_CONSTANTS_H_INCLUDED
+#ifndef SECURITY_PAM_CONSTANTS_H_INCLUDED
+#define SECURITY_PAM_CONSTANTS_H_INCLUDED
 
 #include <security/openpam_version.h>
 
@@ -132,4 +133,4 @@ enum {
 }
 #endif
 
-#endif
+#endif /* !SECURITY_PAM_CONSTANTS_H_INCLUDED */
diff --git a/contrib/openpam/include/security/pam_modules.h b/contrib/openpam/include/security/pam_modules.h
index 821b03d..539f662 100644
--- a/contrib/openpam/include/security/pam_modules.h
+++ b/contrib/openpam/include/security/pam_modules.h
@@ -1,5 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
+ * Copyright (c) 2004-2007 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
@@ -31,11 +32,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/openpam/include/security/pam_modules.h#9 $
+ * $Id: pam_modules.h 408 2007-12-21 11:36:24Z des $
  */
 
-#ifndef _PAM_MODULES_H_INCLUDED
-#define _PAM_MODULES_H_INCLUDED
+#ifndef SECURITY_PAM_MODULES_H_INCLUDED
+#define SECURITY_PAM_MODULES_H_INCLUDED
 
 #include <security/pam_types.h>
 #include <security/pam_constants.h>
@@ -157,4 +158,4 @@ pam_sm_set_mapped_username(pam_handle_t *_pamh,
 }
 #endif
 
-#endif
+#endif /* !SECURITY_PAM_MODULES_H_INCLUDED */
diff --git a/contrib/openpam/include/security/pam_types.h b/contrib/openpam/include/security/pam_types.h
index ebe2eec..0209bc8 100644
--- a/contrib/openpam/include/security/pam_types.h
+++ b/contrib/openpam/include/security/pam_types.h
@@ -1,5 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
+ * Copyright (c) 2004-2007 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
@@ -31,11 +32,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/openpam/include/security/pam_types.h#13 $
+ * $Id: pam_types.h 408 2007-12-21 11:36:24Z des $
  */
 
-#ifndef _PAM_TYPES_H_INCLUDED
-#define _PAM_TYPES_H_INCLUDED
+#ifndef SECURITY_PAM_TYPES_H_INCLUDED
+#define SECURITY_PAM_TYPES_H_INCLUDED
 
 #include <stddef.h>
 
@@ -77,11 +78,11 @@ typedef struct pam_handle pam_handle_t;
 typedef struct pam_repository {
 	char	*type;
 	void	*scope;
-	size_t	scope_len;
+	size_t	 scope_len;
 } pam_repository_t;
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif
+#endif /* !SECURITY_PAM_TYPES_H_INCLUDED */