s3: Disentangle resolve_name() a bit
authorVolker Lendecke <vl@samba.org>
Mon, 12 Sep 2011 18:56:13 +0000 (20:56 +0200)
committerVolker Lendecke <vl@samba.org>
Tue, 13 Sep 2011 09:00:13 +0000 (11:00 +0200)
source3/libsmb/namequery.c

index dca740d3e6bb8d737c1d95ad2b82f411f33774c4..10c19de3c2936d58e44208ba4ac69edf140a6266 100644 (file)
@@ -2699,6 +2699,7 @@ bool resolve_name(const char *name,
        struct ip_service *ss_list = NULL;
        char *sitename = NULL;
        int count = 0;
+       NTSTATUS status;
 
        if (is_ipaddress(name)) {
                return interpret_string_addr(return_ss, name, AI_NUMERICHOST);
@@ -2706,9 +2707,10 @@ bool resolve_name(const char *name,
 
        sitename = sitename_fetch(lp_realm()); /* wild guess */
 
-       if (NT_STATUS_IS_OK(internal_resolve_name(name, name_type, sitename,
-                                                 &ss_list, &count,
-                                                 lp_name_resolve_order()))) {
+       status = internal_resolve_name(name, name_type, sitename,
+                                      &ss_list, &count,
+                                      lp_name_resolve_order());
+       if (NT_STATUS_IS_OK(status)) {
                int i;
 
                if (prefer_ipv4) {