From: Jakub Jelinek <jakub@redhat.com>
Date: Thu, 12 Jul 2007 14:58:16 +0000 (+0000)
Subject: 2007-03-06  Ulrich Drepper  <drepper@redhat.com>
X-Git-Tag: cvs/fedora-glibc-2_5-20070712T1701~52
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3f2fa8591dcfaeeae5cc3ec097cdf06389b8ec76;p=thirdparty%2Fglibc.git

2007-03-06  Ulrich Drepper  <drepper@redhat.com>

	* sysdeps/posix/getaddrinfo.c (get_scope): Correct test for
	172.16/12 address range.
---

diff --git a/ChangeLog b/ChangeLog
index 8b32d0ae82d..823115c96ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-03-06  Ulrich Drepper  <drepper@redhat.com>
+
+	* sysdeps/posix/getaddrinfo.c (get_scope): Correct test for
+	172.16/12 address range.
+
 2007-03-01  Jakub Jelinek  <jakub@redhat.com>
 
 	[BZ #4069]
diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c
index 84a6293365b..e6bda054391 100644
--- a/sysdeps/posix/getaddrinfo.c
+++ b/sysdeps/posix/getaddrinfo.c
@@ -1157,7 +1157,7 @@ get_scope (const struct sockaddr_storage *ss)
 	 169.254/16 and 127/8 are link-local.  */
       if ((addr[0] == 169 && addr[1] == 254) || addr[0] == 127)
 	scope = 2;
-      else if (addr[0] == 10 || (addr[0] == 172 && addr[1] == 16)
+      else if (addr[0] == 10 || (addr[0] == 172 && (addr[1] & 0xf0) == 16)
 	       || (addr[0] == 192 && addr[1] == 168))
 	scope = 5;
       else