Changeset 54011 in vbox

Timestamp:

Jan 28, 2015 12:45:53 PM (10 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

97919

Message:

NAT: Don't switch to host resolver in the unix version of
get_dns_addr_domain() when we fail to get resolv.conf info. This will
be done in the host-idependent caller slirpInitializeDnsSettings().
Ditto for switching out.

No functional change intended.

File:

• trunk/src/VBox/Devices/Network/slirp/slirp_dns.c (modified) (2 diffs)

trunk/src/VBox/Devices/Network/slirp/slirp_dns.c

@@ -164 +164 @@
     rc = rcp_parse(&st, RESOLV_CONF_FILE);
 
-    /* for historical reasons: Slirp returns 0 and fall down to host resolver if wasn't able open resolv.conf file */
-    if(rc == -1)
-    {
-        pData->fUseHostResolver = 1;
-        return 0;
-    }
+    if (rc < 0)
+        return -1;
 
     /* for historical reasons: Slirp returns -1 if no nameservers were found */
@@ -198 +194 @@
                 LogRel(("NAT: DNS server %RTnaipv4 registration detected, switching to the DNS proxy\n", address->IPv4));
                 pData->fUseDnsProxy = 1;
-                pData->fUseHostResolver = 0;
             }
         }