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 03d96bebc054de3b1c17b94e43fdc3849d01bb45..5820afacc8d74460dcdcb09cd086b6829c423171 100644 (file)
--- 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,