summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHerb Lewis <herb@samba.org>2003-01-15 16:44:35 +0000
committerHerb Lewis <herb@samba.org>2003-01-15 16:44:35 +0000
commitf6f4492874e2e4195b70ee9ea1cf0a495e813913 (patch)
tree3c4af71c74b4726151c592b19952f73cded1d6e0
parent43e4cae106ebc581994dccbf1cc4c9c9559e3e8a (diff)
downloadsamba-f6f4492874e2e4195b70ee9ea1cf0a495e813913.tar.gz
samba-f6f4492874e2e4195b70ee9ea1cf0a495e813913.tar.bz2
samba-f6f4492874e2e4195b70ee9ea1cf0a495e813913.zip
initialize acct_ctrl before using it
remove ldap_msgfree(result); as result is unitialized at this point (This used to be commit dc8882778694289ca461de57d443992f52ab7524)
-rw-r--r--source3/passdb/pdb_ldap.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c
index 72b3ef818e..e98a2cf04f 100644
--- a/source3/passdb/pdb_ldap.c
+++ b/source3/passdb/pdb_ldap.c
@@ -914,7 +914,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];
@@ -1794,7 +1794,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;
}