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)

diff --git a/source3/passdb/pdb_smbpasswd.c b/source3/passdb/pdb_smbpasswd.c
index 8dc8f43630454243fcc6dc343f2b71f98ccac8b8..5f94ef62fd709e1e525dd259382eb377d3b48dfd 100644 (file)
--- 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"));