diff options
Diffstat (limited to 'source3/passdb')
| -rw-r--r-- | source3/passdb/smbpass.c | 6 | ||||
| -rw-r--r-- | source3/passdb/smbpasschange.c | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/source3/passdb/smbpass.c b/source3/passdb/smbpass.c index ec1a984b76..45935db99e 100644 --- a/source3/passdb/smbpass.c +++ b/source3/passdb/smbpass.c @@ -329,7 +329,13 @@ static struct smb_passwd *getsmbfilepwent(void *vp) pw_buf.smb_nt_passwd = NULL; pw_buf.smb_passwd = NULL; pw_buf.acct_ctrl |= ACB_DISABLED; + +#if 0 /* JFM */ + /* commented to continue in the case of a trust account disabled */ + /* samr_create_user() is adding disabled accounts */ + return &pw_buf; +#endif } if (linebuf_len < (PTR_DIFF(p, linebuf) + 33)) { diff --git a/source3/passdb/smbpasschange.c b/source3/passdb/smbpasschange.c index 2c971fbff9..0c30bbe4a5 100644 --- a/source3/passdb/smbpasschange.c +++ b/source3/passdb/smbpasschange.c @@ -41,7 +41,9 @@ static BOOL add_new_user(char *user_name, uid_t uid, int local_flags, if(local_flags & LOCAL_DISABLE_USER) { new_smb_pwent.acct_ctrl |= ACB_DISABLED; - } else if (local_flags & LOCAL_SET_NO_PASSWORD) { + } + + if (local_flags & LOCAL_SET_NO_PASSWORD) { new_smb_pwent.acct_ctrl |= ACB_PWNOTREQ; } else { new_smb_pwent.smb_passwd = new_p16; |