Vendor import of OpenPAM Cantaloupe

2 files changed, 12 insertions, 2 deletions

diff --git a/contrib/openpam/include/security/openpam.h b/contrib/openpam/include/security/openpam.h
index 5b5497f..8aaaa30 100644
--- a/contrib/openpam/include/security/openpam.h
+++ b/contrib/openpam/include/security/openpam.h
@@ -49,6 +49,15 @@ extern "C" {
 /*
  * API extensions
  */
+const char *
+openpam_get_option(pam_handle_t *_pamh,
+	const char *_option);
+
+int
+openpam_set_option(pam_handle_t *_pamh,
+	const char *_option,
+	const char *_value);
+
 int
 pam_error(pam_handle_t *_pamh,
 	const char *_fmt,
@@ -196,7 +205,7 @@ static struct pam_module _pam_module = { name PAM_SOEXT, {		\
     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_modules, _pam_module)
+DATA_SET(_openpam_static_modules, _pam_module)
 #else
 /* normal case */
 #define PAM_EXTERN
diff --git a/contrib/openpam/include/security/pam_constants.h b/contrib/openpam/include/security/pam_constants.h
index 71d6ba8..568d42c 100644
--- a/contrib/openpam/include/security/pam_constants.h
+++ b/contrib/openpam/include/security/pam_constants.h
@@ -118,7 +118,8 @@ enum {
 	PAM_OLDAUTHTOK			=   7,
 	PAM_RUSER			=   8,
 	PAM_USER_PROMPT			=   9,
-	PAM_AUTHTOK_PROMPT		=  10		/* OpenPAM extension */
+	PAM_AUTHTOK_PROMPT		=  10,		/* OpenPAM extension */
+	PAM_NUM_ITEMS					/* OpenPAM extension */
 };
 
 #ifdef __cplusplus