Changeset 740 for vendor/current/source3/libsmb/dsgetdcname.c

Timestamp:

Nov 14, 2012, 12:59:34 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to 3.6.0

File:

• vendor/current/source3/libsmb/dsgetdcname.c (modified) (16 diffs)

vendor/current/source3/libsmb/dsgetdcname.c

@@ -22 +22 @@
 
 #include "includes.h"
-
-#define DSGETDCNAME_FMT "DSGETDCNAME/DOMAIN/%s"
+#include "libads/sitename_cache.h"
+#include "../librpc/gen_ndr/ndr_netlogon.h"
+#include "libads/cldap.h"
+#include "libads/dns.h"
+#include "libsmb/clidgram.h"
+
 /* 15 minutes */
 #define DSGETDCNAME_CACHE_TTL   60*15
@@ -123 +127 @@
         }
 
-        return talloc_asprintf_strupper_m(mem_ctx, DSGETDCNAME_FMT, domain);
+        return talloc_asprintf_strupper_m(mem_ctx, "DSGETDCNAME/DOMAIN/%s",
+                                          domain);
 }
 
@@ -190 +195 @@
         r->sockaddr.pdc_ip = talloc_strdup(mem_ctx, addr);
 
-        ndr_err = ndr_push_struct_blob(&blob, mem_ctx, NULL, r,
+        ndr_err = ndr_push_struct_blob(&blob, mem_ctx, r,
                        (ndr_push_flags_fn_t)ndr_push_NETLOGON_SAM_LOGON_RESPONSE_EX);
         if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
@@ -196 +201 @@
         }
 
-        if (r->domain) {
-                status = dsgetdcname_cache_store(mem_ctx, r->domain, &blob);
+        if (r->domain_name) {
+                status = dsgetdcname_cache_store(mem_ctx, r->domain_name, &blob);
                 if (!NT_STATUS_IS_OK(status)) {
                         goto done;
                 }
                 if (r->client_site) {
-                        sitename_store(r->domain, r->client_site);
+                        sitename_store(r->domain_name, r->client_site);
                 }
         }
@@ -341 +346 @@
         }
 
-        ndr_err = ndr_pull_struct_blob(&blob, mem_ctx, NULL, &r,
+        ndr_err = ndr_pull_struct_blob(&blob, mem_ctx, &r,
                       (ndr_pull_flags_fn_t)ndr_pull_NETLOGON_SAM_LOGON_RESPONSE_EX);
 
@@ -497 +502 @@
         dclist = TALLOC_ZERO_ARRAY(mem_ctx, struct ip_service_name, count);
         if (!dclist) {
+                SAFE_FREE(iplist);
                 return NT_STATUS_NO_MEMORY;
         }
@@ -512 +518 @@
                 r->hostname = talloc_strdup(mem_ctx, addr);
                 if (!r->hostname) {
+                        SAFE_FREE(iplist);
                         return NT_STATUS_NO_MEMORY;
                 }
@@ -519 +526 @@
         *returned_dclist = dclist;
         *returned_count = count;
+        SAFE_FREE(iplist);
 
         return NT_STATUS_OK;
@@ -622 +630 @@
                  * anything about the DC's   -- jerry */
 
-                if (!is_zero_addr((struct sockaddr *)(void *)&r->ss)) {
+                if (!is_zero_addr(&r->ss)) {
                         count++;
                         continue;
@@ -687 +695 @@
                 info->forest_name = talloc_strdup(mem_ctx, forest_name);
                 NT_STATUS_HAVE_NO_MEMORY(info->forest_name);
-                flags |= DS_DNS_FOREST;
+                flags |= DS_DNS_FOREST_ROOT;
         }
 
@@ -783 +791 @@
         map_dc_and_domain_names(flags,
                                 r->pdc_name,
-                                r->domain,
+                                r->domain_name,
                                 r->pdc_dns_name,
                                 r->dns_domain,
@@ -892 +900 @@
 /****************************************************************
 ****************************************************************/
-
-static struct event_context *ev_context(void)
-{
-        static struct event_context *ctx;
-
-        if (!ctx && !(ctx = event_context_init(NULL))) {
-                smb_panic("Could not init event context");
-        }
-        return ctx;
-}
-
-/****************************************************************
-****************************************************************/
-
-static struct messaging_context *msg_context(TALLOC_CTX *mem_ctx)
-{
-        static struct messaging_context *ctx;
-
-        if (!ctx && !(ctx = messaging_init(mem_ctx, server_id_self(),
-                                           ev_context()))) {
-                smb_panic("Could not init messaging context");
-        }
-        return ctx;
-}
 
 /****************************************************************
@@ -941 +925 @@
                               NETLOGON_NT_VERSION_5EX_WITH_IP;
 
-        if (!msg_ctx) {
-                msg_ctx = msg_context(mem_ctx);
+        if (msg_ctx == NULL) {
+                return NT_STATUS_INVALID_PARAMETER;
         }
 
@@ -954 +938 @@
 
         for (i=0; i<num_dcs; i++) {
+                uint16_t val;
+                int dgm_id;
+
+                generate_random_buffer((uint8_t *)&val, 2);
+                dgm_id = val;
 
                 ip_list.ss = dclist[i].ss;
@@ -962 +951 @@
                 }
 
-                if (send_getdc_request(mem_ctx, msg_ctx,
-                                       &dclist[i].ss, domain_name,
-                                       NULL, nt_version))
-                {
-                        int k;
-                        smb_msleep(300);
-                        for (k=0; k<5; k++) {
-                                if (receive_getdc_response(mem_ctx,
-                                                           &dclist[i].ss,
-                                                           domain_name,
-                                                           &nt_version,
-                                                           &dc_name,
-                                                           &r)) {
-                                        store_cache = true;
-                                        namecache_store(dc_name, NBT_NAME_SERVER, 1, &ip_list);
-                                        goto make_reply;
-                                }
-                                smb_msleep(1500);
-                        }
+                status = nbt_getdc(msg_ctx, &dclist[i].ss, domain_name,
+                                   NULL, nt_version,
+                                   mem_ctx, &nt_version, &dc_name, &r);
+                if (NT_STATUS_IS_OK(status)) {
+                        store_cache = true;
+                        namecache_store(dc_name, NBT_NAME_SERVER, 1, &ip_list);
+                        goto make_reply;
                 }
 
@@ -999 +976 @@
 
                         logon1.nt_version = nt_version;
-                        logon1.server = tmp_dc_name;
-                        logon1.domain = talloc_strdup_upper(mem_ctx, domain_name);
-                        NT_STATUS_HAVE_NO_MEMORY(logon1.domain);
+                        logon1.pdc_name = tmp_dc_name;
+                        logon1.domain_name = talloc_strdup_upper(mem_ctx, domain_name);
+                        NT_STATUS_HAVE_NO_MEMORY(logon1.domain_name);
 
                         r->data.nt4 = logon1;