summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2001-05-04 14:28:28 +0000
committerGerald Carter <jerry@samba.org>2001-05-04 14:28:28 +0000
commit1f7a451c1e059b5a86e1e78debd582579aa7bcb7 (patch)
treeb7493f19fde2b4cdaa4e95c497d90a02a5f7add6
parente62b35ac6975b3fde9741ea864bad366c672d06e (diff)
downloadsamba-1f7a451c1e059b5a86e1e78debd582579aa7bcb7.tar.gz
samba-1f7a451c1e059b5a86e1e78debd582579aa7bcb7.tar.bz2
samba-1f7a451c1e059b5a86e1e78debd582579aa7bcb7.zip
merge from 2.2 in password_ok() to ensure that we check the
return code from smb_pam_accountcheck() (This used to be commit d5d6f01aaf8d344bb44dbe047c2f760ca220529e)
-rw-r--r--source3/smbd/password.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/smbd/password.c b/source3/smbd/password.c
index 03d96bebc0..5820afacc8 100644
--- a/source3/smbd/password.c
+++ b/source3/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,