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

Timestamp:

May 12, 2014, 8:58:38 PM (11 years ago)

Author:

Silvan Scherrer

Message:

Samba 3.6: updated vendor to latest version

File:

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

vendor/current/source3/libsmb/dsgetdcname.c

@@ -322 +322 @@
                                         const struct GUID *domain_guid,
                                         uint32_t flags,
-                                        const char *site_name,
                                         struct netr_DsRGetDCNameInfo **info_p)
 {
@@ -395 +394 @@
 
         status = dsgetdcname_cache_fetch(mem_ctx, domain_name, domain_guid,
-                                         flags, site_name, info);
+                                         flags, info);
         if (!NT_STATUS_IS_OK(status)
             && !NT_STATUS_EQUAL(status, NT_STATUS_NOT_FOUND)) {
@@ -1084 +1083 @@
 
 /********************************************************************
+ Internal dsgetdcname.
+********************************************************************/
+
+static NTSTATUS dsgetdcname_internal(TALLOC_CTX *mem_ctx,
+                     struct messaging_context *msg_ctx,
+                     const char *domain_name,
+                     const struct GUID *domain_guid,
+                     const char *site_name,
+                     uint32_t flags,
+                     struct netr_DsRGetDCNameInfo **info)
+{
+        NTSTATUS status = NT_STATUS_DOMAIN_CONTROLLER_NOT_FOUND;
+        struct netr_DsRGetDCNameInfo *myinfo = NULL;
+        bool first = true;
+        struct netr_DsRGetDCNameInfo *first_info = NULL;
+
+        DEBUG(10,("dsgetdcname_internal: domain_name: %s, "
+                  "domain_guid: %s, site_name: %s, flags: 0x%08x\n",
+                  domain_name,
+                  domain_guid ? GUID_string(mem_ctx, domain_guid) : "(null)",
+                  site_name ? site_name : "(null)", flags));
+
+        *info = NULL;
+
+        if (!check_allowed_required_flags(flags, site_name)) {
+                DEBUG(0,("invalid flags specified\n"));
+                return NT_STATUS_INVALID_PARAMETER;
+        }
+
+        if (flags & DS_FORCE_REDISCOVERY) {
+                goto rediscover;
+        }
+
+        status = dsgetdcname_cached(mem_ctx, msg_ctx, domain_name, domain_guid,
+                                    flags, site_name, &myinfo);
+        if (NT_STATUS_IS_OK(status)) {
+                goto done;
+        }
+
+        if (flags & DS_BACKGROUND_ONLY) {
+                goto done;
+        }
+
+ rediscover:
+        status = dsgetdcname_rediscover(mem_ctx, msg_ctx, domain_name,
+                                        domain_guid, flags, site_name,
+                                        &myinfo);
+
+ done:
+        if (!NT_STATUS_IS_OK(status)) {
+                if (!first) {
+                        *info = first_info;
+                        return NT_STATUS_OK;
+                }
+                return status;
+        }
+
+        if (!first) {
+                TALLOC_FREE(first_info);
+        } else if (!is_closest_site(myinfo)) {
+                first = false;
+                first_info = myinfo;
+                /* TODO: may use the next_closest_site here */
+                site_name = myinfo->client_site_name;
+                goto rediscover;
+        }
+
+        *info = myinfo;
+        return NT_STATUS_OK;
+}
+
+/********************************************************************
  dsgetdcname.
 
@@ -1097 +1168 @@
                      struct netr_DsRGetDCNameInfo **info)
 {
-        NTSTATUS status = NT_STATUS_DOMAIN_CONTROLLER_NOT_FOUND;
-        struct netr_DsRGetDCNameInfo *myinfo = NULL;
-        char *query_site = NULL;
-        bool first = true;
-        struct netr_DsRGetDCNameInfo *first_info = NULL;
-
-        DEBUG(10,("dsgetdcname: domain_name: %s, "
-                  "domain_guid: %s, site_name: %s, flags: 0x%08x\n",
-                  domain_name,
-                  domain_guid ? GUID_string(mem_ctx, domain_guid) : "(null)",
-                  site_name, flags));
-
-        *info = NULL;
-
-        if (!check_allowed_required_flags(flags, site_name)) {
-                DEBUG(0,("invalid flags specified\n"));
-                return NT_STATUS_INVALID_PARAMETER;
-        }
+        NTSTATUS status;
+        const char *query_site = NULL;
+        char *ptr_to_free = NULL;
+        bool retry_query_with_null = false;
 
         if ((site_name == NULL) || (site_name[0] == '\0')) {
-                query_site = sitename_fetch(domain_name);
+                ptr_to_free = sitename_fetch(domain_name);
+                if (ptr_to_free != NULL) {
+                        retry_query_with_null = true;
+                }
+                query_site = ptr_to_free;
         } else {
-                query_site = SMB_STRDUP(site_name);
-        }
-
-        if (flags & DS_FORCE_REDISCOVERY) {
-                goto rediscover;
-        }
-
-        status = dsgetdcname_cached(mem_ctx, msg_ctx, domain_name, domain_guid,
-                                    flags, query_site, &myinfo);
-        if (NT_STATUS_IS_OK(status)) {
-                goto done;
-        }
-
-        if (flags & DS_BACKGROUND_ONLY) {
-                goto done;
-        }
-
- rediscover:
-        status = dsgetdcname_rediscover(mem_ctx, msg_ctx, domain_name,
-                                        domain_guid, flags, query_site,
-                                        &myinfo);
-
- done:
-        SAFE_FREE(query_site);
-
-        if (!NT_STATUS_IS_OK(status)) {
-                if (!first) {
-                        *info = first_info;
-                        return NT_STATUS_OK;
-                }
+                query_site = site_name;
+        }
+
+        status = dsgetdcname_internal(mem_ctx,
+                                msg_ctx,
+                                domain_name,
+                                domain_guid,
+                                query_site,
+                                flags,
+                                info);
+
+        SAFE_FREE(ptr_to_free);
+
+        if (!NT_STATUS_EQUAL(status, NT_STATUS_DOMAIN_CONTROLLER_NOT_FOUND)) {
                 return status;
         }
 
-        if (!first) {
-                TALLOC_FREE(first_info);
-        } else if (!is_closest_site(myinfo)) {
-                first = false;
-                first_info = myinfo;
-                /* TODO: may use the next_closest_site here */
-                query_site = SMB_STRDUP(myinfo->client_site_name);
-                goto rediscover;
-        }
-
-        *info = myinfo;
-        return NT_STATUS_OK;
-}
+        /* Should we try again with site_name == NULL ? */
+        if (retry_query_with_null) {
+                status = dsgetdcname_internal(mem_ctx,
+                                        msg_ctx,
+                                        domain_name,
+                                        domain_guid,
+                                        NULL,
+                                        flags,
+                                        info);
+        }
+
+        return status;
+}