aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2008-03-26 17:45:14 +0000
committerUlrich Drepper <drepper@redhat.com>2008-03-26 17:45:14 +0000
commitfde15fdc5bea3d66be8fa967031ab89707b08a39 (patch)
tree2454b4c0f6030813bb38508980a3a4482ce638da
parentc28175eccecf6f964ddd6687fc7696843eeba34d (diff)
downloadglibc-fde15fdc5bea3d66be8fa967031ab89707b08a39.tar
glibc-fde15fdc5bea3d66be8fa967031ab89707b08a39.tar.gz
glibc-fde15fdc5bea3d66be8fa967031ab89707b08a39.tar.bz2
glibc-fde15fdc5bea3d66be8fa967031ab89707b08a39.zip
* 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.
-rw-r--r--ChangeLog6
-rw-r--r--sysdeps/posix/getaddrinfo.c1
2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 185955fe19..b4cafe0dee 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 fb18bba47d..9a27efdf83 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