summaryrefslogtreecommitdiff
path: root/source3/libnet
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2009-03-18 17:35:03 +1100
committerGünther Deschner <gd@samba.org>2009-04-06 15:54:41 +0200
commit20501876735fc4656083747ba8aa0de9da8fb820 (patch)
treed75bfbfe09fca5c751855d5bde0e255358d71383 /source3/libnet
parent9d9f9452815f99dae61976b843af14f54c42009c (diff)
downloadsamba-20501876735fc4656083747ba8aa0de9da8fb820.tar.gz
samba-20501876735fc4656083747ba8aa0de9da8fb820.tar.bz2
samba-20501876735fc4656083747ba8aa0de9da8fb820.zip
s3:libads Make ads_get_dn() take a talloc context
Also remove ads_memfree(), which was only ever a wrapper around SAFE_FREE, used only to free the DN from ads_get_ds(). This actually makes libgpo more consistant, as it mixed a talloc and a malloc based string on the same element. Andrew Bartlett Signed-off-by: Günther Deschner <gd@samba.org>
Diffstat (limited to 'source3/libnet')
-rw-r--r--source3/libnet/libnet_join.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/libnet/libnet_join.c b/source3/libnet/libnet_join.c
index ccfd943a8d..fe9fd66fdc 100644
--- a/source3/libnet/libnet_join.c
+++ b/source3/libnet/libnet_join.c
@@ -303,7 +303,7 @@ static ADS_STATUS libnet_join_find_machine_acct(TALLOC_CTX *mem_ctx,
goto done;
}
- dn = ads_get_dn(r->in.ads, res);
+ dn = ads_get_dn(r->in.ads, mem_ctx, res);
if (!dn) {
status = ADS_ERROR_LDAP(LDAP_NO_MEMORY);
goto done;
@@ -317,7 +317,7 @@ static ADS_STATUS libnet_join_find_machine_acct(TALLOC_CTX *mem_ctx,
done:
ads_msgfree(r->in.ads, res);
- ads_memfree(r->in.ads, dn);
+ TALLOC_FREE(dn);
return status;
}