From: Jeremy Allison <jra@samba.org> 
Date: Tue, 1 May 2001 17:19:42 +0000 (+0000)
Subject: Added Andrew Bartlett's fixes to my changes to his original patch (at the
X-Git-Tag: samba-2.2.5pre1~2087^2~128
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=acc3e7a057ad7fb0c2fb1cafff0c623ec0524d04;p=thirdparty%2Fsamba.git

Added Andrew Bartlett's fixes to my changes to his original patch (at the
court of king caractacus, was just passing by... :-).
Jeremy.
---

diff --git a/source/auth/pampass.c b/source/auth/pampass.c
index 09b84db71ac..061e5ee0bf1 100644
--- a/source/auth/pampass.c
+++ b/source/auth/pampass.c
@@ -664,9 +664,9 @@ uint32 smb_pam_passcheck(char * user, char * password)
 	 */
 
 	if ((pconv = smb_setup_pam_conv(smb_pam_conv, user, password, NULL)) == NULL)
-		return False;
+		return NT_STATUS_LOGON_FAILURE;
 
-	if (!smb_pam_start(&pamh, user, NULL, NULL))
+	if (!smb_pam_start(&pamh, user, NULL, pconv))
 		return NT_STATUS_LOGON_FAILURE;
 
 	if ((nt_status = smb_pam_auth(pamh, user)) != NT_STATUS_NOPROBLEMO) {
diff --git a/source/auth/pass_check.c b/source/auth/pass_check.c
index 05f7138c3c7..9424189b236 100644
--- a/source/auth/pass_check.c
+++ b/source/auth/pass_check.c
@@ -599,7 +599,7 @@ static BOOL password_check(char *password)
 {
 
 #ifdef WITH_PAM
-	return (smb_pam_passcheck(this_user, password));
+	return (smb_pam_passcheck(this_user, password) == NT_STATUS_NOPROBLEMO);
 #endif /* WITH_PAM */
 
 #ifdef WITH_AFS
diff --git a/source/passdb/pampass.c b/source/passdb/pampass.c
index 09b84db71ac..061e5ee0bf1 100644
--- a/source/passdb/pampass.c
+++ b/source/passdb/pampass.c
@@ -664,9 +664,9 @@ uint32 smb_pam_passcheck(char * user, char * password)
 	 */
 
 	if ((pconv = smb_setup_pam_conv(smb_pam_conv, user, password, NULL)) == NULL)
-		return False;
+		return NT_STATUS_LOGON_FAILURE;
 
-	if (!smb_pam_start(&pamh, user, NULL, NULL))
+	if (!smb_pam_start(&pamh, user, NULL, pconv))
 		return NT_STATUS_LOGON_FAILURE;
 
 	if ((nt_status = smb_pam_auth(pamh, user)) != NT_STATUS_NOPROBLEMO) {
diff --git a/source/passdb/pass_check.c b/source/passdb/pass_check.c
index 05f7138c3c7..9424189b236 100644
--- a/source/passdb/pass_check.c
+++ b/source/passdb/pass_check.c
@@ -599,7 +599,7 @@ static BOOL password_check(char *password)
 {
 
 #ifdef WITH_PAM
-	return (smb_pam_passcheck(this_user, password));
+	return (smb_pam_passcheck(this_user, password) == NT_STATUS_NOPROBLEMO);
 #endif /* WITH_PAM */
 
 #ifdef WITH_AFS