s3:dsgetdcname: retry with the clients site

metze
(cherry picked from commit 1b7b0e924f3064a9774fd5d46bedc3d342b39ddb)
(cherry picked from commit f7a811f2ae3572791035014b6e20410b07ea011e)

diff --git a/source/libsmb/dsgetdcname.c b/source/libsmb/dsgetdcname.c
index 2b8f76a2035b16495a3b317e8681ba86241659d1..72c3c734f8420507f77663466a35312d452988df 100644 (file)
--- a/source/libsmb/dsgetdcname.c
+++ b/source/libsmb/dsgetdcname.c
@@ -1383,6 +1383,27 @@ static NTSTATUS dsgetdcname_rediscover(TALLOC_CTX *mem_ctx,
                                  num_dcs, info);
 }
 
+static bool is_closest_site(struct netr_DsRGetDCNameInfo *info)
+{
+       if (info->dc_flags & DS_SERVER_CLOSEST) {
+               return true;
+       }
+
+       if (!info->client_site_name) {
+               return true;
+       }
+
+       if (!info->dc_site_name) {
+               return false;
+       }
+
+       if (strcmp(info->client_site_name, info->dc_site_name) == 0) {
+               return true;
+       }
+
+       return false;
+}
+
 /********************************************************************
  dsgetdcname.
 
@@ -1400,6 +1421,8 @@ NTSTATUS dsgetdcname(TALLOC_CTX *mem_ctx,
        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",
@@ -1427,7 +1450,6 @@ NTSTATUS dsgetdcname(TALLOC_CTX *mem_ctx,
        status = dsgetdcname_cached(mem_ctx, msg_ctx, domain_name, domain_guid,
                                    flags, query_site, &myinfo);
        if (NT_STATUS_IS_OK(status)) {
-               *info = myinfo;
                goto done;
        }
 
@@ -1440,12 +1462,27 @@ NTSTATUS dsgetdcname(TALLOC_CTX *mem_ctx,
                                        domain_guid, flags, query_site,
                                        &myinfo);
 
-       if (NT_STATUS_IS_OK(status)) {
-               *info = myinfo;
-       }
-
  done:
        SAFE_FREE(query_site);
 
-       return status;
+       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 */
+               query_site = SMB_STRDUP(myinfo->client_site_name);
+               goto rediscover;
+       }
+
+       *info = myinfo;
+       return NT_STATUS_OK;
 }