Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/networking/nslookup.c

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/networking/nslookup.c (modified) (2 diffs)

branches/3.3/mindi-busybox/networking/nslookup.c

@@ -139 +139 @@
     len_and_sockaddr *lsa;
 
+    if (!server)
+        return;
+
     /* NB: this works even with, say, "[::1]:5353"! :) */
     lsa = xhost2sockaddr(server, 53);
@@ -182 +185 @@
     /*_res.options |= RES_USE_INET6;*/
 
-    if (argv[2])
-        set_default_dns(argv[2]);
+    set_default_dns(argv[2]);
 
     server_print();
+
+    /* getaddrinfo and friends are free to request a resolver
+     * reinitialization. Just in case, set_default_dns() again
+     * after getaddrinfo (in server_print). This reportedly helps
+     * with bug 675 "nslookup does not properly use second argument"
+     * at least on Debian Wheezy and Openwrt AA (eglibc based).
+     */
+    set_default_dns(argv[2]);
+
     return print_host(argv[1], "Name:");
 }