diff options
| author | Jeremy Allison <jra@samba.org> | 2003-10-31 19:16:57 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2003-10-31 19:16:57 +0000 |
| commit | 73a9e080cd5bdd657a3dfd9ba57730060fa344e9 (patch) | |
| tree | 0c585f41b9fca1d128e64730109d31f41570d8a1 | |
| parent | b99fb9397f3772a7dec81a4a24c0df8aa9386253 (diff) | |
| download | samba-73a9e080cd5bdd657a3dfd9ba57730060fa344e9.tar.gz samba-73a9e080cd5bdd657a3dfd9ba57730060fa344e9.tar.bz2 samba-73a9e080cd5bdd657a3dfd9ba57730060fa344e9.zip | |
Patch from Aurélien Degrémont <adegremont@idealx.com>. "entry" is dependent
on "result", don't free result first.
Jeremy.
(This used to be commit 9b24715170c6ca5dd3d5df0675f430852ae6a50d)
| -rw-r--r-- | source3/passdb/pdb_ldap.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c index e0148494d3..9299ca2e50 100644 --- a/source3/passdb/pdb_ldap.c +++ b/source3/passdb/pdb_ldap.c @@ -1983,21 +1983,22 @@ static NTSTATUS ldapsam_update_group_mapping_entry(struct pdb_methods *methods, return NT_STATUS_UNSUCCESSFUL; } - ldap_msgfree(result); - if (mods == NULL) { DEBUG(4, ("ldapsam_update_group_mapping_entry: mods is empty: nothing to do\n")); + ldap_msgfree(result); return NT_STATUS_OK; } dn = smbldap_get_dn(ldap_state->smbldap_state->ldap_struct, entry); if (!dn) { + ldap_msgfree(result); return NT_STATUS_UNSUCCESSFUL; } rc = smbldap_modify(ldap_state->smbldap_state, dn, mods); SAFE_FREE(dn); ldap_mods_free(mods, True); + ldap_msgfree(result); if (rc != LDAP_SUCCESS) { char *ld_error = NULL; @@ -2006,6 +2007,7 @@ static NTSTATUS ldapsam_update_group_mapping_entry(struct pdb_methods *methods, DEBUG(0, ("ldapsam_update_group_mapping_entry: failed to modify group %lu error: %s (%s)\n", (unsigned long)map->gid, ld_error ? ld_error : "(unknown)", ldap_err2string(rc))); SAFE_FREE(ld_error); + return NT_STATUS_UNSUCCESSFUL; } DEBUG(2, ("ldapsam_update_group_mapping_entry: successfully modified group %lu in LDAP\n", (unsigned long)map->gid)); |