summary refs log tree commit diff
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2015-06-18 19:48:22 +0000
committerJoseph Myers <joseph@codesourcery.com>2015-06-18 19:48:22 +0000
commitd1ac55d89023f86a34e46e9f064746334014ae28 (patch)
treee0b8f89a6f22b4d9781bfa9dcb092a0f94b20df6
parenta6336cc446a7ed682cb9dbc47cc56ebf9f9a4229 (diff)
downloadglibc-d1ac55d89023f86a34e46e9f064746334014ae28.tar.gz
glibc-d1ac55d89023f86a34e46e9f064746334014ae28.tar.xz
glibc-d1ac55d89023f86a34e46e9f064746334014ae28.zip
Fix netinet/in.h MCAST_* namespace (bug 18558).
sysdeps/unix/sysv/linux/bits/in.h (as included in netinet/in.h, and
via that in netdb.h and arpa/inet.h) defines a series of MCAST_*
macros, both under __USE_MISC and then again unconditionally.  These
are not POSIX macros, nor in any of the namespaces listed in POSIX as
reserved for this header, so should not be defined unconditionally.
This patch duly removes the unconditional definitions, leaving the
ones conditional on __USE_MISC.

Tested for x86_64 and x86 (testsuite, and that installed stripped
shared libraries are unchanged by the patch).

	[BZ #18558]
	* sysdeps/unix/sysv/linux/bits/in.h (MCAST_JOIN_GROUP): Remove
	unconditional definition.
	(MCAST_BLOCK_SOURCE): Likewise.
	(MCAST_UNBLOCK_SOURCE): Likewise.
	(MCAST_LEAVE_GROUP): Likewise.
	(MCAST_JOIN_SOURCE_GROUP): Likewise.
	(MCAST_LEAVE_SOURCE_GROUP): Likewise.
	(MCAST_MSFILTER): Likewise.
	* conform/Makefile (test-xfail-XOPEN2K/arpa/inet.h/conform):
	Remove variable.
	(test-xfail-XOPEN2K/netdb.h/conform): Likewise.
	(test-xfail-XOPEN2K/netinet/in.h/conform): Likewise.
	(test-xfail-XOPEN2K8/arpa/inet.h/conform): Likewise.
	(test-xfail-XOPEN2K8/netdb.h/conform): Likewise.
	(test-xfail-XOPEN2K8/netinet/in.h/conform): Likewise.
-rw-r--r--ChangeLog19
-rw-r--r--NEWS2
-rw-r--r--conform/Makefile6
-rw-r--r--sysdeps/unix/sysv/linux/bits/in.h7
4 files changed, 20 insertions, 14 deletions
diff --git a/ChangeLog b/ChangeLog
index 8aeb643c2d..9931dd1308 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2015-06-18  Joseph Myers  <joseph@codesourcery.com>
+
+	[BZ #18558]
+	* sysdeps/unix/sysv/linux/bits/in.h (MCAST_JOIN_GROUP): Remove
+	unconditional definition.
+	(MCAST_BLOCK_SOURCE): Likewise.
+	(MCAST_UNBLOCK_SOURCE): Likewise.
+	(MCAST_LEAVE_GROUP): Likewise.
+	(MCAST_JOIN_SOURCE_GROUP): Likewise.
+	(MCAST_LEAVE_SOURCE_GROUP): Likewise.
+	(MCAST_MSFILTER): Likewise.
+	* conform/Makefile (test-xfail-XOPEN2K/arpa/inet.h/conform):
+	Remove variable.
+	(test-xfail-XOPEN2K/netdb.h/conform): Likewise.
+	(test-xfail-XOPEN2K/netinet/in.h/conform): Likewise.
+	(test-xfail-XOPEN2K8/arpa/inet.h/conform): Likewise.
+	(test-xfail-XOPEN2K8/netdb.h/conform): Likewise.
+	(test-xfail-XOPEN2K8/netinet/in.h/conform): Likewise.
+
 2015-06-18  Andrew Senkevich  <andrew.senkevich@intel.com>
 
 	* NEWS: Mention addition of x86_64 vector sincosf.
diff --git a/NEWS b/NEWS
index 050522f7b6..3f474f37b8 100644
--- a/NEWS
+++ b/NEWS
@@ -23,7 +23,7 @@ Version 2.22
   18444, 18468, 18469, 18470, 18479, 18483, 18495, 18496, 18497, 18498,
   18507, 18512, 18519, 18520, 18522, 18527, 18528, 18529, 18530, 18532,
   18533, 18534, 18536, 18539, 18540, 18542, 18544, 18545, 18546, 18547,
-  18553.
+  18553, 18558.
 
 * Cache information can be queried via sysconf() function on s390 e.g. with
   _SC_LEVEL1_ICACHE_SIZE as argument.
diff --git a/conform/Makefile b/conform/Makefile
index 4bc8121d49..30eaa64365 100644
--- a/conform/Makefile
+++ b/conform/Makefile
@@ -231,13 +231,10 @@ test-xfail-UNIX98/ucontext.h/conform = yes
 test-xfail-UNIX98/unistd.h/conform = yes
 test-xfail-UNIX98/utmpx.h/conform = yes
 test-xfail-XOPEN2K/aio.h/conform = yes
-test-xfail-XOPEN2K/arpa/inet.h/conform = yes
 test-xfail-XOPEN2K/fcntl.h/conform = yes
 test-xfail-XOPEN2K/langinfo.h/conform = yes
 test-xfail-XOPEN2K/math.h/conform = yes
 test-xfail-XOPEN2K/mqueue.h/conform = yes
-test-xfail-XOPEN2K/netdb.h/conform = yes
-test-xfail-XOPEN2K/netinet/in.h/conform = yes
 test-xfail-XOPEN2K/semaphore.h/conform = yes
 test-xfail-XOPEN2K/signal.h/conform = yes
 test-xfail-XOPEN2K/stdarg.h/conform = yes
@@ -261,12 +258,9 @@ test-xfail-POSIX2008/signal.h/conform = yes
 test-xfail-POSIX2008/stropts.h/conform = yes
 test-xfail-POSIX2008/sys/socket.h/conform = yes
 test-xfail-POSIX2008/sys/wait.h/conform = yes
-test-xfail-XOPEN2K8/arpa/inet.h/conform = yes
 test-xfail-XOPEN2K8/fcntl.h/conform = yes
 test-xfail-XOPEN2K8/limits.h/conform = yes
 test-xfail-XOPEN2K8/math.h/conform = yes
-test-xfail-XOPEN2K8/netdb.h/conform = yes
-test-xfail-XOPEN2K8/netinet/in.h/conform = yes
 test-xfail-XOPEN2K8/signal.h/conform = yes
 test-xfail-XOPEN2K8/stdio.h/conform = yes
 test-xfail-XOPEN2K8/stropts.h/conform = yes
diff --git a/sysdeps/unix/sysv/linux/bits/in.h b/sysdeps/unix/sysv/linux/bits/in.h
index b1d2cf60f3..43db11ce35 100644
--- a/sysdeps/unix/sysv/linux/bits/in.h
+++ b/sysdeps/unix/sysv/linux/bits/in.h
@@ -114,13 +114,6 @@
 #define IP_ADD_SOURCE_MEMBERSHIP	39
 #define IP_DROP_SOURCE_MEMBERSHIP	40
 #define IP_MSFILTER			41
-#define MCAST_JOIN_GROUP		42
-#define MCAST_BLOCK_SOURCE		43
-#define MCAST_UNBLOCK_SOURCE		44
-#define MCAST_LEAVE_GROUP		45
-#define MCAST_JOIN_SOURCE_GROUP		46
-#define MCAST_LEAVE_SOURCE_GROUP	47
-#define MCAST_MSFILTER			48
 #define IP_MULTICAST_ALL		49
 #define IP_UNICAST_IF			50