From: Ulrich Drepper <drepper@redhat.com>
Date: Thu, 10 Sep 1998 12:56:51 +0000 (+0000)
Subject: Update.
X-Git-Tag: cvs/glibc-2_0_96~44
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=482a3be2990e5d2778b3d7b339cbb1d4cda43dae;p=thirdparty%2Fglibc.git

Update.

1998-09-10 12:51  Ulrich Drepper  <drepper@cygnus.com>

	* resolv/res_init.c (res_init): Initialize _res.nscount and
	_res.nsaddr.sin_port differently for the can when no loopback
	is available to allow immediate timeout in non-networking environments.
	Patch by Cristian Gafton <gafton@redhat.com>.
---

diff --git a/ChangeLog b/ChangeLog
index dbed963641e..1c7c7002496 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+1998-09-10 12:51  Ulrich Drepper  <drepper@cygnus.com>
+
+	* resolv/res_init.c (res_init): Initialize _res.nscount and
+	_res.nsaddr.sin_port differently for the can when no loopback
+	is available to allow immediate timeout in non-networking environments.
+	Patch by Cristian Gafton <gafton@redhat.com>.
+
 1998-09-10  Andreas Jaeger  <aj@arthur.rhein-neckar.de>
 
 	* localedata/charmaps/ISO-8859-10: Character 0xBD is HORIZONTAL
diff --git a/resolv/res_init.c b/resolv/res_init.c
index 906a2b15715..2d2459d5a30 100644
--- a/resolv/res_init.c
+++ b/resolv/res_init.c
@@ -206,12 +206,14 @@ 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.nscount = 1;
 	_res.ndots = 1;
 	_res.pfcode = 0;