From: Ulrich Drepper <drepper@redhat.com>
Date: Wed, 23 Sep 1998 15:31:17 +0000 (+0000)
Subject: (res_init): Handle resolv.conf file with only one nameserver
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5cf6d7a85f56659e7bdb8a8de5741c2e2d206a1b;p=thirdparty%2Fglibc.git

(res_init): Handle resolv.conf file with only one nameserver
correctly.
---

diff --git a/resolv/res_init.c b/resolv/res_init.c
index 7a2e28ec7ea..fb4680c6224 100644
--- a/resolv/res_init.c
+++ b/resolv/res_init.c
@@ -207,13 +207,12 @@ res_init()
 #ifdef USELOOPBACK
 	_res.nsaddr.sin_addr = inet_makeaddr(IN_LOOPBACKNET, 1);
 	_res.nscount = 1;
-	_res.nsaddr.sin_port = htons(NAMESERVER_PORT);
 #else
 	_res.nsaddr.sin_addr.s_addr = INADDR_ANY;
 	_res.nscount = 0;
-	_res.nsaddr.sin_port = 0;
 #endif
 	_res.nsaddr.sin_family = AF_INET;
+	_res.nsaddr.sin_port = htons(NAMESERVER_PORT);
 	_res.ndots = 1;
 	_res.pfcode = 0;
 
@@ -380,7 +379,7 @@ res_init()
 		    continue;
 		}
 	    }
-	    if (nserv > 1)
+	    if (nserv > _res.nscount)
 		_res.nscount = nserv;
 #ifdef RESOLVSORT
 	    _res.nsort = nsort;
@@ -572,7 +571,7 @@ netinfo_res_init(haveenv, havesearch)
 		    ni_namelist_free(&nl);
 		}
 
-		if (nserv > 1)
+		if (nserv > _res.nscount)
 		    _res.nscount = nserv;
 
 #ifdef RESOLVSORT