Changeset 140 for branches/samba-3.0/source/libsmb/namequery.c

Timestamp:

07/11/08 01:13:42 (5 months ago)

Author:

psmedley

Message:

Update branch to 3.0.31 release

Files:

• branches/samba-3.0/source/libsmb/namequery.c (modified) (7 diffs)

branches/samba-3.0/source/libsmb/namequery.c

@@ -1429 +1429 @@
         BOOL done_auto_lookup = False;
         int auto_count = 0;
+        NTSTATUS status;
+
+        *ip_list = NULL;
+        *count = 0;
 
         *ordered = False;
@@ -1481 +1485 @@
                 if (internal_resolve_name(domain, 0x1C, sitename, ip_list, count,
                                           resolve_order)) {
-                        return NT_STATUS_OK;
+                        status = NT_STATUS_OK;
+                        goto out;
                 } else {
-                        return NT_STATUS_NO_LOGON_SERVERS;
+                        status = NT_STATUS_NO_LOGON_SERVERS;
+                        goto out;
                 }
         }
@@ -1498 +1504 @@
         p = pserver;
         while (next_token(&p,name,LIST_SEP,sizeof(name))) {
-                if (strequal(name, "*")) {
+                if (!done_auto_lookup && strequal(name, "*")) {
                         if (internal_resolve_name(domain, 0x1C, sitename, &auto_ip_list,
                                                   &auto_count, resolve_order))
@@ -1515 +1521 @@
                 if ( done_auto_lookup ) {
                         DEBUG(4,("get_dc_list: no servers found\n")); 
-                        SAFE_FREE(auto_ip_list);
-                        return NT_STATUS_NO_LOGON_SERVERS;
+                        status = NT_STATUS_NO_LOGON_SERVERS;
+                        goto out;
                 }
                 if (internal_resolve_name(domain, 0x1C, sitename, ip_list, count,
                                           resolve_order)) {
-                        return NT_STATUS_OK;
+                        status = NT_STATUS_OK;
+                        goto out;
                 } else {
-                        return NT_STATUS_NO_LOGON_SERVERS;
+                        status = NT_STATUS_NO_LOGON_SERVERS;
+                        goto out;
                 }
         }
@@ -1528 +1536 @@
         if ( (return_iplist = SMB_MALLOC_ARRAY(struct ip_service, num_addresses)) == NULL ) {
                 DEBUG(3,("get_dc_list: malloc fail !\n"));
-                SAFE_FREE(auto_ip_list);
-                return NT_STATUS_NO_MEMORY;
+                status = NT_STATUS_NO_MEMORY;
+                goto out;
         }
 
@@ -1586 +1594 @@
         }
                                 
-        SAFE_FREE(auto_ip_list);
-
         /* need to remove duplicates in the list if we have any 
            explicit password servers */
@@ -1607 +1613 @@
         *count = local_count;
 
-        return ( *count != 0 ? NT_STATUS_OK : NT_STATUS_NO_LOGON_SERVERS );
+        status = ( *count != 0 ? NT_STATUS_OK : NT_STATUS_NO_LOGON_SERVERS );
+
+  out:
+
+        if (!NT_STATUS_IS_OK(status)) {
+                SAFE_FREE(return_iplist);
+                *ip_list = NULL;
+                *count = 0;
+        }
+
+        SAFE_FREE(auto_ip_list);
+
+        return status;
 }