initialize acct_ctrl variable before it is used
authorHerb Lewis <herb@samba.org>
Wed, 15 Jan 2003 16:41:29 +0000 (16:41 +0000)
committerHerb Lewis <herb@samba.org>
Wed, 15 Jan 2003 16:41:29 +0000 (16:41 +0000)
remove ldap_msgfree(result); as result is unitialized at this point
(This used to be commit 1102a6f8cdf295d564df5447a223b354be72895d)

source3/passdb/pdb_ldap.c

index 7c3c6f1f1fe1f27c2f109c31b7bf980a138b6bf8..7e443a97c6166102ff6931d0e085f4d7d22b64b3 100644 (file)
@@ -907,7 +907,7 @@ static BOOL init_sam_from_ldap (struct ldapsam_privates *ldap_state,
                        group_rid;
        uint8           smblmpwd[LM_HASH_LEN],
                        smbntpwd[NT_HASH_LEN];
-       uint16          acct_ctrl, 
+       uint16          acct_ctrl = 0
                        logon_divs;
        uint32 hours_len;
        uint8           hours[MAX_HOURS_LEN];
@@ -1787,7 +1787,6 @@ static NTSTATUS ldapsam_update_sam_account(struct pdb_methods *my_methods, SAM_A
 
        if (!init_ldap_from_sam(ldap_state, &mods, LDAP_MOD_REPLACE, False, newpwd)) {
                DEBUG(0, ("ldapsam_update_sam_account: init_ldap_from_sam failed!\n"));
-               ldap_msgfree(result);
                return NT_STATUS_UNSUCCESSFUL;
        }