From: Gerald Carter <jerry@samba.org> 
Date: Fri, 4 May 2001 14:28:28 +0000 (+0000)
Subject: merge from 2.2 in password_ok() to ensure that we check the
X-Git-Tag: samba-2.2.5pre1~2087^2~98
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d5d6f01aaf8d344bb44dbe047c2f760ca220529e;p=thirdparty%2Fsamba.git

merge from 2.2 in password_ok() to ensure that we check the
return code from smb_pam_accountcheck()
---

diff --git a/source/smbd/password.c b/source/smbd/password.c
index 03d96bebc05..5820afacc8d 100644
--- a/source/smbd/password.c
+++ b/source/smbd/password.c
@@ -626,7 +626,7 @@ BOOL password_ok(char *user, char *password, int pwlen, struct passwd *pwd)
 		 */
 
 		if (ret)
-			return smb_pam_accountcheck(user);
+			return (smb_pam_accountcheck(user) == NT_STATUS_NOPROBLEMO);
 	} 
 
 	return pass_check(user, password, pwlen, pwd,