From: Jeremy Allison <jra@samba.org> 
Date: Tue, 1 May 2001 18:25:20 +0000 (+0000)
Subject: Runtime check for broken PAM systems with no appdata_ptr support. This
X-Git-Tag: samba-2.2.5pre1~2087^2~126
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=52a9226a5aaa769e960619c2bd0a561dd9b0493d;p=thirdparty%2Fsamba.git

Runtime check for broken PAM systems with no appdata_ptr support. This
should eventually be an autoconf test with a #ifdef workaround. I *HATE* pam :-).
Jeremy.
---

diff --git a/source/auth/pampass.c b/source/auth/pampass.c
index 68024f94810..8f62d353173 100644
--- a/source/auth/pampass.c
+++ b/source/auth/pampass.c
@@ -113,6 +113,16 @@ static int smb_pam_conv(int num_msg,
 
 	*resp = NULL;
 
+	/*
+	 * Apparantly HPUX has a buggy PAM that doesn't support the
+	 * appdata_ptr. Fail if this is the case. JRA.
+	 */
+
+	if (udp == NULL) {
+		DEBUG(0,("smb_pam_conv: PAM on this system is broken - appdata_ptr == NULL !\n"));
+		return PAM_CONV_ERR;
+	}
+
 	reply = malloc(sizeof(struct pam_response) * num_msg);
 	if (!reply)
 		return PAM_CONV_ERR;
@@ -170,6 +180,18 @@ static int smb_pam_passchange_conv(int num_msg,
 	char *p = lp_passwd_chat();
 	struct smb_pam_userdata *udp = (struct smb_pam_userdata *)appdata_ptr;
 
+	*resp = NULL;
+
+	/*
+	 * Apparantly HPUX has a buggy PAM that doesn't support the
+	 * appdata_ptr. Fail if this is the case. JRA.
+	 */
+
+	if (udp == NULL) {
+		DEBUG(0,("smb_pam_passchange_conv: PAM on this system is broken - appdata_ptr == NULL !\n"));
+		return PAM_CONV_ERR;
+	}
+
 	/* Get the prompts... */
 
 	if (!next_token(&p, currentpw_prompt, NULL, sizeof(fstring)))
@@ -179,8 +201,6 @@ static int smb_pam_passchange_conv(int num_msg,
 	if (!next_token(&p, repeatpw_prompt, NULL, sizeof(fstring)))
 		return PAM_CONV_ERR;
 
-	*resp = NULL;
-
 	reply = malloc(sizeof(struct pam_response) * num_msg);
 	if (!reply)
 		return PAM_CONV_ERR;
diff --git a/source/passdb/pampass.c b/source/passdb/pampass.c
index 68024f94810..8f62d353173 100644
--- a/source/passdb/pampass.c
+++ b/source/passdb/pampass.c
@@ -113,6 +113,16 @@ static int smb_pam_conv(int num_msg,
 
 	*resp = NULL;
 
+	/*
+	 * Apparantly HPUX has a buggy PAM that doesn't support the
+	 * appdata_ptr. Fail if this is the case. JRA.
+	 */
+
+	if (udp == NULL) {
+		DEBUG(0,("smb_pam_conv: PAM on this system is broken - appdata_ptr == NULL !\n"));
+		return PAM_CONV_ERR;
+	}
+
 	reply = malloc(sizeof(struct pam_response) * num_msg);
 	if (!reply)
 		return PAM_CONV_ERR;
@@ -170,6 +180,18 @@ static int smb_pam_passchange_conv(int num_msg,
 	char *p = lp_passwd_chat();
 	struct smb_pam_userdata *udp = (struct smb_pam_userdata *)appdata_ptr;
 
+	*resp = NULL;
+
+	/*
+	 * Apparantly HPUX has a buggy PAM that doesn't support the
+	 * appdata_ptr. Fail if this is the case. JRA.
+	 */
+
+	if (udp == NULL) {
+		DEBUG(0,("smb_pam_passchange_conv: PAM on this system is broken - appdata_ptr == NULL !\n"));
+		return PAM_CONV_ERR;
+	}
+
 	/* Get the prompts... */
 
 	if (!next_token(&p, currentpw_prompt, NULL, sizeof(fstring)))
@@ -179,8 +201,6 @@ static int smb_pam_passchange_conv(int num_msg,
 	if (!next_token(&p, repeatpw_prompt, NULL, sizeof(fstring)))
 		return PAM_CONV_ERR;
 
-	*resp = NULL;
-
 	reply = malloc(sizeof(struct pam_response) * num_msg);
 	if (!reply)
 		return PAM_CONV_ERR;