Merge branch 'master' of ssh://git.samba.org/data/git/samba into libcli-auth-merge

[abartlet/samba.git/.git] / source3 / libnet / libnet_join.c

diff --git a/source3/libnet/libnet_join.c b/source3/libnet/libnet_join.c
index ccfd943a8de1c61aa4b3dab2ab8fff15570dfb04..724cc90596a2b9585038216cbd608d0cc377da8a 100644 (file)
--- a/source3/libnet/libnet_join.c
+++ b/source3/libnet/libnet_join.c
@@ -20,6 +20,7 @@
 
 #include "includes.h"
 #include "libnet/libnet.h"
+#include "libcli/auth/libcli_auth.h"
 
 /****************************************************************
 ****************************************************************/
@@ -303,7 +304,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 +318,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;
 }