From: Ulrich Drepper <drepper@redhat.com>
Date: Wed, 26 Mar 2008 17:45:14 +0000 (+0000)
Subject: * posix/gai.conf: Fix comment for scope nullbits.
X-Git-Tag: cvs/fedora-glibc-20080328T1347~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fde15fdc5bea3d66be8fa967031ab89707b08a39;p=platform%2Fupstream%2Fglibc.git

* posix/gai.conf: Fix comment for scope nullbits.

	* sysdeps/posix/getaddrinfo.c (gaiconf_init): If /bits is not present,
	default to 128 bits for v4 mapped addresses.
---

diff --git a/ChangeLog b/ChangeLog
index 185955f..b4cafe0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-03-25  Jakub Jelinek  <jakub@redhat.com>
+
+	* posix/gai.conf: Fix comment for scope nullbits.
+	* sysdeps/posix/getaddrinfo.c (gaiconf_init): If /bits is not present,
+	default to 128 bits for v4 mapped addresses.
+
 2008-03-07  Martin Schwidefsky  <schwidefsky@de.ibm.com>
 
 	* sysdeps/s390/fpu/fegetenv.c (fegetenv): Remove PTRACE_PEEKUSER
diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c
index fb18bba..9a27efd 100644
--- a/sysdeps/posix/getaddrinfo.c
+++ b/sysdeps/posix/getaddrinfo.c
@@ -1775,6 +1775,7 @@ gaiconf_init (void)
 		    *cp++ = '\0';
 		  if (inet_pton (AF_INET6, val1, &prefix))
 		    {
+		      bits = 128;
 		      if (IN6_IS_ADDR_V4MAPPED (&prefix)
 			  && (cp == NULL
 			      || (bits = strtoul (cp, &endp, 10)) != ULONG_MAX