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

Timestamp:

Nov 24, 2016, 1:14:11 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.3

File:

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

vendor/current/source3/libsmb/dsgetdcname.c

@@ -25 +25 @@
 #include "../librpc/gen_ndr/ndr_netlogon.h"
 #include "libads/cldap.h"
-#include "libads/dns.h"
+#include "../lib/addns/dnsquery.h"
 #include "libsmb/clidgram.h"
 
@@ -33 +33 @@
 struct ip_service_name {
         struct sockaddr_storage ss;
-        unsigned port;
         const char *hostname;
 };
@@ -46 +45 @@
 ****************************************************************/
 
-void debug_dsdcinfo_flags(int lvl, uint32_t flags)
+static void debug_dsdcinfo_flags(int lvl, uint32_t flags)
 {
         DEBUG(lvl,("debug_dsdcinfo_flags: 0x%08x\n\t", flags));
@@ -286 +285 @@
                                              uint32_t req_flags)
 {
-        if (ret_flags == 0) {
+        if (req_flags == 0) {
                 return true;
         }
@@ -336 +335 @@
         }
 
-        if (!gencache_get_data_blob(key, &blob, NULL, NULL)) {
+        if (!gencache_get_data_blob(key, NULL, &blob, NULL, NULL)) {
                 return NT_STATUS_NOT_FOUND;
         }
 
-        info = TALLOC_ZERO_P(mem_ctx, struct netr_DsRGetDCNameInfo);
+        info = talloc_zero(mem_ctx, struct netr_DsRGetDCNameInfo);
         if (!info) {
+                data_blob_free(&blob);
                 return NT_STATUS_NO_MEMORY;
         }
@@ -479 +479 @@
         struct ip_service_name *dclist = NULL;
         int count;
+        static const char *resolve_order[] = { "lmhosts", "wins", "bcast", NULL };
 
         *returned_dclist = NULL;
         *returned_count = 0;
 
-        if (lp_disable_netbios()) {
-                return NT_STATUS_NOT_SUPPORTED;
-        }
-
         if (flags & DS_PDC_REQUIRED) {
                 name_type = NBT_NAME_PDC;
@@ -493 +490 @@
         status = internal_resolve_name(domain_name, name_type, NULL,
                                        &iplist, &count,
-                                       "lmhosts wins bcast");
+                                       resolve_order);
         if (!NT_STATUS_IS_OK(status)) {
                 DEBUG(10,("discover_dc_netbios: failed to find DC\n"));
@@ -499 +496 @@
         }
 
-        dclist = TALLOC_ZERO_ARRAY(mem_ctx, struct ip_service_name, count);
+        dclist = talloc_zero_array(mem_ctx, struct ip_service_name, count);
         if (!dclist) {
                 SAFE_FREE(iplist);
@@ -514 +511 @@
 
                 r->ss   = iplist[i].ss;
-                r->port = iplist[i].port;
                 r->hostname = talloc_strdup(mem_ctx, addr);
                 if (!r->hostname) {
@@ -550 +546 @@
 
         if (flags & DS_PDC_REQUIRED) {
-                status = ads_dns_query_pdc(mem_ctx, domain_name,
-                                           &dcs, &numdcs);
+                status = ads_dns_query_pdc(mem_ctx,
+                                           domain_name,
+                                           &dcs,
+                                           &numdcs);
         } else if (flags & DS_GC_SERVER_REQUIRED) {
-                status = ads_dns_query_gcs(mem_ctx, domain_name, site_name,
-                                           &dcs, &numdcs);
+                status = ads_dns_query_gcs(mem_ctx,
+                                           domain_name,
+                                           site_name,
+                                           &dcs,
+                                           &numdcs);
         } else if (flags & DS_KDC_REQUIRED) {
-                status = ads_dns_query_kdcs(mem_ctx, domain_name, site_name,
-                                            &dcs, &numdcs);
+                status = ads_dns_query_kdcs(mem_ctx,
+                                            domain_name,
+                                            site_name,
+                                            &dcs,
+                                            &numdcs);
         } else if (flags & DS_DIRECTORY_SERVICE_REQUIRED) {
-                status = ads_dns_query_dcs(mem_ctx, domain_name, site_name,
-                                           &dcs, &numdcs);
+                status = ads_dns_query_dcs(mem_ctx,
+                                           domain_name,
+                                           site_name,
+                                           &dcs,
+                                           &numdcs);
         } else if (domain_guid) {
-                status = ads_dns_query_dcs_guid(mem_ctx, domain_name,
-                                                domain_guid, &dcs, &numdcs);
+                struct GUID_txt_buf buf;
+                GUID_buf_string(domain_guid, &buf);
+
+                status = ads_dns_query_dcs_guid(mem_ctx,
+                                                domain_name,
+                                                buf.buf,
+                                                &dcs,
+                                                &numdcs);
         } else {
-                status = ads_dns_query_dcs(mem_ctx, domain_name, site_name,
-                                           &dcs, &numdcs);
+                status = ads_dns_query_dcs(mem_ctx,
+                                           domain_name,
+                                           site_name,
+                                           &dcs,
+                                           &numdcs);
         }
 
@@ -581 +597 @@
         }
 
-        dclist = TALLOC_ZERO_ARRAY(mem_ctx,
+        dclist = talloc_zero_array(mem_ctx,
                                    struct ip_service_name,
                                    numaddrs);
@@ -598 +614 @@
                 struct ip_service_name *r = &dclist[count];
 
-                r->port = dcs[i].port;
                 r->hostname = dcs[i].hostname;
 
@@ -609 +624 @@
                         j = 0;
                 } else {
-                        /* use the IP addresses from the SRV sresponse */
+                        /* use the IP addresses from the SRV response */
 
                         if (j >= dcs[i].num_ips) {
@@ -623 +638 @@
                 /* make sure it is a valid IP.  I considered checking the
                  * negative connection cache, but this is the wrong place for
-                 * it.  Maybe only as a hac.  After think about it, if all of
-                 * the IP addresses retuend from DNS are dead, what hope does a
+                 * it.  Maybe only as a hack. After think about it, if all of
+                 * the IP addresses returned from DNS are dead, what hope does a
                  * netbios name lookup have?  The standard reason for falling
                  * back to netbios lookups is that our DNS server doesn't know
@@ -662 +677 @@
         struct netr_DsRGetDCNameInfo *info;
 
-        info = TALLOC_ZERO_P(mem_ctx, struct netr_DsRGetDCNameInfo);
+        info = talloc_zero(mem_ctx, struct netr_DsRGetDCNameInfo);
         NT_STATUS_HAVE_NO_MEMORY(info);
 
@@ -778 +793 @@
                 dc_address = addr;
                 dc_address_type = DS_ADDRESS_TYPE_INET;
-        }
-
-        if (!ss && r->sockaddr.pdc_ip) {
-                dc_address      = r->sockaddr.pdc_ip;
-                dc_address_type = DS_ADDRESS_TYPE_INET;
         } else {
-                dc_address      = r->pdc_name;
-                dc_address_type = DS_ADDRESS_TYPE_NETBIOS;
+                if (r->sockaddr.pdc_ip) {
+                        dc_address      = r->sockaddr.pdc_ip;
+                        dc_address_type = DS_ADDRESS_TYPE_INET;
+                } else {
+                        dc_address      = r->pdc_name;
+                        dc_address_type = DS_ADDRESS_TYPE_NETBIOS;
+                }
         }
 
@@ -864 +879 @@
         for (i=0; i<num_dcs; i++) {
 
-                DEBUG(10,("LDAP ping to %s\n", dclist[i].hostname));
-
-                if (ads_cldap_netlogon(mem_ctx, dclist[i].hostname,
+                char addr[INET6_ADDRSTRLEN];
+                print_sockaddr(addr, sizeof(addr), &dclist[i].ss);
+
+                DEBUG(10,("LDAP ping to %s (%s)\n", dclist[i].hostname, addr));
+
+                if (ads_cldap_netlogon(mem_ctx, &dclist[i].ss,
                                         domain_name,
                                         nt_version,
@@ -938 +956 @@
         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;
@@ -967 +983 @@
                         struct NETLOGON_SAM_LOGON_RESPONSE_NT40 logon1;
 
-                        r = TALLOC_ZERO_P(mem_ctx, struct netlogon_samlogon_response);
+                        r = talloc_zero(mem_ctx, struct netlogon_samlogon_response);
                         NT_STATUS_HAVE_NO_MEMORY(r);
 
@@ -1023 +1039 @@
         if (flags & DS_IS_FLAT_NAME) {
 
+                if (lp_disable_netbios()) {
+                        return NT_STATUS_NOT_SUPPORTED;
+                }
+
                 status = discover_dc_netbios(mem_ctx, domain_name, flags,
                                              &dclist, &num_dcs);
@@ -1051 +1071 @@
                         return status;
                 }
+        }
+
+        if (lp_disable_netbios()) {
+                return NT_STATUS_DOMAIN_CONTROLLER_NOT_FOUND;
         }
 
@@ -1174 +1198 @@
 
         if ((site_name == NULL) || (site_name[0] == '\0')) {
-                ptr_to_free = sitename_fetch(domain_name);
+                ptr_to_free = sitename_fetch(mem_ctx, domain_name);
                 if (ptr_to_free != NULL) {
                         retry_query_with_null = true;
@@ -1191 +1215 @@
                                 info);
 
-        SAFE_FREE(ptr_to_free);
+        TALLOC_FREE(ptr_to_free);
 
         if (!NT_STATUS_EQUAL(status, NT_STATUS_DOMAIN_CONTROLLER_NOT_FOUND)) {