summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
Diffstat (limited to 'source3')
-rw-r--r--source3/smbd/password.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/source3/smbd/password.c b/source3/smbd/password.c
index da01cf4f37..2f720db9c1 100644
--- a/source3/smbd/password.c
+++ b/source3/smbd/password.c
@@ -514,10 +514,14 @@ BOOL pass_check_smb(char *user, char *domain,
return(False);
}
- if (lm_pwd[0] == '\0' && (smb_pass->acct_ctrl & ACB_PWNOTREQ) && lp_null_passwords())
- {
- DEBUG(3,("Account for user '%s' has no password and null passwords are allowed.\n", smb_pass->smb_name));
- return(True);
+ if (smb_pass->acct_ctrl & ACB_PWNOTREQ) {
+ if (lp_null_passwords()) {
+ DEBUG(3,("Account for user '%s' has no password and null passwords are allowed.\n", smb_pass->smb_name));
+ return(True);
+ } else {
+ DEBUG(3,("Account for user '%s' has no password and null passwords are NOT allowed.\n", smb_pass->smb_name));
+ return(False);
+ }
}
if (smb_password_ok(smb_pass, chal, lm_pwd, nt_pwd))