net: fix the order of DC lookup methods when joining a domain

[samba.git] / source3 / libnet / libnet_dssync_keytab.c

diff --git a/source3/libnet/libnet_dssync_keytab.c b/source3/libnet/libnet_dssync_keytab.c
index 6f3ed642260734eced4fd0fcf41636888dbc4a49..66e75620d1b856836cf0a69e1dd05196bfd70929 100644 (file)
--- a/source3/libnet/libnet_dssync_keytab.c
+++ b/source3/libnet/libnet_dssync_keytab.c
@@ -20,7 +20,6 @@
 
 #include "includes.h"
 #include "smb_krb5.h"
-#include "ads.h"
 #include "libnet/libnet_dssync.h"
 #include "libnet/libnet_keytab.h"
 #include "librpc/gen_ndr/ndr_drsblobs.h"
@@ -200,7 +199,7 @@ static  NTSTATUS parse_supplemental_credentials(TALLOC_CTX *mem_ctx,
                goto done;
        }
 
-       pkb = TALLOC_ZERO_P(mem_ctx, struct package_PrimaryKerberosBlob);
+       pkb = talloc_zero(mem_ctx, struct package_PrimaryKerberosBlob);
        if (!pkb) {
                status = NT_STATUS_NO_MEMORY;
                goto done;
@@ -387,7 +386,7 @@ static NTSTATUS parse_object(TALLOC_CTX *mem_ctx,
                entry = libnet_keytab_search(ctx, principal, 0, ENCTYPE_NULL,
                                             mem_ctx);
                if (entry) {
-                       name = (char *)TALLOC_MEMDUP(mem_ctx,
+                       name = (char *)talloc_memdup(mem_ctx,
                                                     entry->password.data,
                                                     entry->password.length);
                        if (!name) {