Changeset 232 for branches/samba-3.2.x/source/libsmb/dsgetdcname.c

Timestamp:

May 27, 2009, 9:09:42 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 branch to 3.2.8

File:

• branches/samba-3.2.x/source/libsmb/dsgetdcname.c (modified) (4 diffs)

branches/samba-3.2.x/source/libsmb/dsgetdcname.c

@@ -1384 +1384 @@
 }
 
+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.
@@ -1401 +1422 @@
         struct netr_DsRGetDCNameInfo *myinfo = NULL;
         char *query_site = NULL;
+        bool first = true;
+        struct netr_DsRGetDCNameInfo *first_info = NULL;
 
         DEBUG(10,("dsgetdcname: domain_name: %s, "
@@ -1428 +1451 @@
                                     flags, query_site, &myinfo);
         if (NT_STATUS_IS_OK(status)) {
-                *info = myinfo;
                 goto done;
         }
@@ -1441 +1463 @@
                                         &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;
+}