Changeset 138 for trunk/samba/source/libsmb/namequery.c

Timestamp:

Jul 3, 2008, 11:23:12 AM (17 years ago)

Author:

Paul Smedley

Message:

Update source to 3.2.0 GA level

File:

• trunk/samba/source/libsmb/namequery.c (modified) (6 diffs)

trunk/samba/source/libsmb/namequery.c

@@ -1836 +1836 @@
         TALLOC_CTX *ctx = talloc_init("get_dc_list");
 
+        *ip_list = NULL;
+        *count = 0;
+
         if (!ctx) {
                 return NT_STATUS_NO_MEMORY;
@@ -1915 +1918 @@
         p = pserver;
         while (next_token_talloc(ctx, &p, &name, LIST_SEP)) {
-                if (strequal(name, "*")) {
+                if (!done_auto_lookup && strequal(name, "*")) {
                         status = internal_resolve_name(domain, 0x1C, sitename,
                                                        &auto_ip_list,
@@ -2056 +2059 @@
   out:
 
+        if (!NT_STATUS_IS_OK(status)) {
+                SAFE_FREE(return_iplist);
+                *ip_list = NULL;
+                *count = 0;
+        }
+
         SAFE_FREE(auto_ip_list);
         TALLOC_FREE(ctx);
@@ -2075 +2084 @@
         enum dc_lookup_type lookup_type = DC_NORMAL_LOOKUP;
 
+        *ip_list = NULL;
+        *count = 0;
+
         DEBUG(8,("get_sorted_dc_list: attempting lookup "
                 "for name %s (sitename %s) using [%s]\n",
@@ -2088 +2100 @@
                         count, lookup_type, &ordered);
         if (!NT_STATUS_IS_OK(status)) {
+                SAFE_FREE(*ip_list);
+                *count = 0;
                 return status;
         }
@@ -2118 +2132 @@
 
         if (!NT_STATUS_IS_OK(status)) {
+                SAFE_FREE(*ip_list);
+                *count = 0;
                 return status;
         }