From: Siddhesh Poyarekar <siddhesh@redhat.com>
Date: Mon, 15 Sep 2014 04:38:38 +0000 (+0530)
Subject: Add correct variable names for _POSIX_IPV6 and _POSIX_RAW_SOCKETS
X-Git-Tag: glibc-2.21~557
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3f41521d4b9697634d3f574ee5fd3a22f217b25d;p=thirdparty%2Fglibc.git

Add correct variable names for _POSIX_IPV6 and _POSIX_RAW_SOCKETS

getconf only recognizes IPV6 and RAW_SOCKETS, when the standard
requires it to recognize the actual configuration variable name[1].  I
have not removed the earlier names for compatibility.

	* posix/getconf.c (vars): Add _POSIX_IPV6 and
	_POSIX_RAW_SOCKETS.

[1] http://pubs.opengroup.org/onlinepubs/007904875/functions/sysconf.html
---

diff --git a/ChangeLog b/ChangeLog
index 9f5d84e77b2..d010cc9dd07 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-09-15  Siddhesh Poyarekar  <siddhesh@redhat.com>
+
+	* posix/getconf.c (vars): Add _POSIX_IPV6 and
+	_POSIX_RAW_SOCKETS.
+
 2014-09-13  Allan McRae  <allan@archlinux.org>
 
 	* po/ru.po: Update Russian translation from translation project.
diff --git a/posix/getconf.c b/posix/getconf.c
index db6acc4c451..c2c0d3f67d8 100644
--- a/posix/getconf.c
+++ b/posix/getconf.c
@@ -1004,6 +1004,13 @@ static const struct conf vars[] =
     { "RAW_SOCKETS", _SC_RAW_SOCKETS, SYSCONF },
 #endif
 
+#ifdef _SC_IPV6
+    { "_POSIX_IPV6", _SC_IPV6, SYSCONF },
+#endif
+#ifdef _SC_RAW_SOCKETS
+    { "_POSIX_RAW_SOCKETS", _SC_RAW_SOCKETS, SYSCONF },
+#endif
+
     { NULL, 0, SYSCONF }
   };