[PATCH] resolver does not try other nameservers on SERVFAIL

[Michel Stam]

Commit e1420eca7374cd8f583e9d774c890645a205aaee fixed a bug where a
response code should mean the next server is tried. However, it tries
only the next search domain, and never skips to the next server.

In my specific situation, I was using tmdns as a DNS -> mDNS bridge to 
resolve mDNS names. tmdns returns SERVFAIL on any domain that does not 
end in .local.

uClibc then tries all the search domains in /etc/resolv.conf and gives 
up, not jumping to the next nameserver in the list (in my case the real 
nameserver). Thus, any non-.local domain never got resolved.

My resolv.conf;
domain bla.net
search bla.net
nameserver 127.0.0.1
nameserver 172.16.1.1

The patch I have attached basically allows SERVFAIL to go back to the 
case as it was before 0.9.32, except that search domains are still tried.

Best regards,

Michel Stam


-------------- next part --------------
>From 3e44112543d61f73f5955793c6718e9f327f55ec Mon Sep 17 00:00:00 2001
From: Michel Stam <michel at reverze.net>
Date: Thu, 27 Feb 2014 21:42:38 +0100
Subject: [PATCH] resolv: try next server on SERVFAIL

Commit e1420eca7374cd8f583e9d774c890645a205aaee fixed a bug where a
response code should mean the next server is tried. However, it tries
only the next search domain, and never skips to the next server. This
fix makes sure we try the next server on SERVFAIL.

Signed-off-by: Michel Stam <michel at reverze.net>
---
 libc/inet/resolv.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/libc/inet/resolv.c b/libc/inet/resolv.c
index 154734d..cfc1eee 100644
--- a/libc/inet/resolv.c
+++ b/libc/inet/resolv.c
@@ -1471,9 +1471,11 @@ int __dns_lookup(const char *name,
 				}
 				/* no more search domains to try */
 			}
-			/* dont loop, this is "no such host" situation */
-			h_errno = HOST_NOT_FOUND;
-			goto fail1;
+			if (h.rcode != SERVFAIL) {
+				/* dont loop, this is "no such host" situation */
+				h_errno = HOST_NOT_FOUND;
+				goto fail1;
+			}
 		}
 		/* Insert other non-fatal errors here, which do not warrant
 		 * switching to next nameserver */
-- 
1.7.1