Bail out early if null passwords and lp_null_passwords not set.

Jeremy.
(This used to be commit 7c718fc85e3dbfaf0195e352d06a8c682a6036fc)

diff --git a/source3/smbd/password.c b/source3/smbd/password.c
index 12f7385f06c891250b89e04a830cff052def77c8..fa973dd720927e827546bebe0fb030c6da5dcf21 100644 (file)
--- a/source3/smbd/password.c
+++ b/source3/smbd/password.c
@@ -586,6 +586,11 @@ return True if the password is correct, False otherwise
 ****************************************************************************/
 BOOL password_ok(char *user, char *password, int pwlen, struct passwd *pwd)
 {
+       if ((pwlen == 0) && !lp_null_passwords()) {
+               DEBUG(4,("Null passwords not allowed.\n"));
+               return False;
+       }
+
        if (pwlen == 24 || (lp_encrypted_passwords() && (pwlen == 0) && lp_null_passwords()))
        {
                /* if 24 bytes long assume it is an encrypted password */