diff options
| author | Gerald Carter <jerry@samba.org> | 2004-02-12 17:51:23 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2004-02-12 17:51:23 +0000 |
| commit | eaece3bbe600c69cb407be0b79fb3023ee6dab93 (patch) | |
| tree | a1b7ccce60582cba6e256abcc5843bd0c9d393a6 | |
| parent | db40d06dd468ec6639be69dfcb6e36eb499f0c70 (diff) | |
| download | samba-eaece3bbe600c69cb407be0b79fb3023ee6dab93.tar.gz samba-eaece3bbe600c69cb407be0b79fb3023ee6dab93.tar.bz2 samba-eaece3bbe600c69cb407be0b79fb3023ee6dab93.zip | |
abartlet's pdb_set/changed flag fix for NULL passwords
(This used to be commit cfe80f0df7ecfa6c689b03b9bed80ea80701a4c1)
| -rw-r--r-- | source3/passdb/pdb_interface.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/source3/passdb/pdb_interface.c b/source3/passdb/pdb_interface.c index 57f3ce7e98..f5c198b2ea 100644 --- a/source3/passdb/pdb_interface.c +++ b/source3/passdb/pdb_interface.c @@ -61,13 +61,13 @@ static void pdb_force_pw_initialization(SAM_ACCOUNT *pass) { lm_pwd = pdb_get_lanman_passwd(pass); if (lm_pwd) - pdb_set_lanman_passwd(pass, NULL, PDB_SET); + pdb_set_lanman_passwd(pass, NULL, PDB_CHANGED); } if (pdb_get_init_flags(pass, PDB_NTPASSWD) != PDB_DEFAULT) { nt_pwd = pdb_get_nt_passwd(pass); if (nt_pwd) - pdb_set_nt_passwd(pass, NULL, PDB_SET); + pdb_set_nt_passwd(pass, NULL, PDB_CHANGED); } } @@ -248,8 +248,7 @@ static NTSTATUS context_add_sam_account(struct pdb_context *context, SAM_ACCOUNT acb_flags = pdb_get_acct_ctrl( sam_acct ); if ( !lm_pw && !nt_pw && !(acb_flags&ACB_PWNOTREQ) ) { acb_flags |= ACB_DISABLED; - pdb_set_acct_ctrl( sam_acct, acb_flags, PDB_SET ); - pdb_set_init_flags(sam_acct, PDB_ACCTCTRL, PDB_SET); + pdb_set_acct_ctrl( sam_acct, acb_flags, PDB_CHANGED ); } /** @todo This is where a 're-read on add' should be done */ @@ -283,8 +282,7 @@ static NTSTATUS context_update_sam_account(struct pdb_context *context, SAM_ACCO acb_flags = pdb_get_acct_ctrl( sam_acct ); if ( !lm_pw && !nt_pw && !(acb_flags&ACB_PWNOTREQ) ) { acb_flags |= ACB_DISABLED; - pdb_set_acct_ctrl( sam_acct, acb_flags, PDB_SET ); - pdb_set_init_flags(sam_acct, PDB_ACCTCTRL, PDB_SET); + pdb_set_acct_ctrl( sam_acct, acb_flags, PDB_CHANGED ); } /** @todo This is where a 're-read on update' should be done */ |