abartlet's pdb_set/changed flag fix for NULL passwords

[kai/samba.git] / source3 / passdb / pdb_interface.c

diff --git a/source3/passdb/pdb_interface.c b/source3/passdb/pdb_interface.c
index 57f3ce7e9814ddde2b4f2d3546681fcea03ee42f..f5c198b2ea095ba3a56cb3931433096a16bcda99 100644 (file)
--- 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 */