diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2002-07-13 09:10:16 +0000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2002-07-13 09:10:16 +0000 |
| commit | 6b903424fe1e641c484f9b86eff5b4e12009d0b6 (patch) | |
| tree | 98a2724aa38df98a9f85fd9dab7b973b80098cb9 | |
| parent | 224e73803bb42a6547dd5621d4f0dcdb829ffbd7 (diff) | |
| download | samba-6b903424fe1e641c484f9b86eff5b4e12009d0b6.tar.gz samba-6b903424fe1e641c484f9b86eff5b4e12009d0b6.tar.bz2 samba-6b903424fe1e641c484f9b86eff5b4e12009d0b6.zip | |
Make smbpasswd behave like all the other backends, where a NULL or invalid
LM password isn't anything special. All the users check the ACB nowadays,
and this allows us to correctly return flags set via usermgr.
Andrew Bartlett
(This used to be commit 89eb765d398de7654ba6bac7c51df727830c2591)
| -rw-r--r-- | source3/passdb/pdb_smbpasswd.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/source3/passdb/pdb_smbpasswd.c b/source3/passdb/pdb_smbpasswd.c index 8dc8f43630..5f94ef62fd 100644 --- a/source3/passdb/pdb_smbpasswd.c +++ b/source3/passdb/pdb_smbpasswd.c @@ -408,13 +408,10 @@ static struct smb_passwd *getsmbfilepwent(struct smbpasswd_privates *smbpasswd_s p++; if (*p == '*' || *p == 'X') { - /* Password deliberately invalid - end here. */ - DEBUG(10, ("getsmbfilepwent: entry invalidated for user %s\n", user_name)); - pw_buf->smb_nt_passwd = NULL; - pw_buf->smb_passwd = NULL; - pw_buf->acct_ctrl |= ACB_DISABLED; - return pw_buf; - } + /* NULL LM password */ + pw_buf->smb_passwd = NULL; + DEBUG(10, ("getsmbfilepwent: LM password for user %s invalidated\n", user_name)); + } if (linebuf_len < (PTR_DIFF(p, linebuf) + 33)) { DEBUG(0, ("getsmbfilepwent: malformed password entry (passwd too short)\n")); |