Remove excess declarations from unistd.h for XPG3/XPG4 (bug 17665).

For XPG3/XPG4 (defined __USE_XOPEN && !defined __USE_UNIX98), unistd.h
declares many functions that should only be declared for __USE_MISC
(none of them are in XPG3/XPG4): sethostname sethostid getdomainname
setdomainname vhangup revoke profil acct getusershell endusershell
setusershell daemon.  The whole block with the [__USE_MISC ||
(__USE_XOPEN && !__USE_UNIX98)] conditional contains only functions
that are not in XPG3/XPG4, so this patch simply changes the
conditional.

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

	[BZ #17665]
	* posix/unistd.h [__USE_MISC || (__USE_XOPEN && !__USE_UNIX98)]:
	Change conditional to [__USE_MISC].

diff --git a/ChangeLog b/ChangeLog
index f532ed6b1a40fdf3cc10c58a44e971b8571e2723..3b764c00b2ef5f319fa320a02156b0dc313453b4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2014-12-02  Joseph Myers  <joseph@codesourcery.com>
 
+       [BZ #17665]
+       * posix/unistd.h [__USE_MISC || (__USE_XOPEN && !__USE_UNIX98)]:
+       Change conditional to [__USE_MISC].
+
        [BZ #17664]
        * misc/mntent_r.c (__getmntent_r): Use __fgets_unlocked instead of
        fgets_unlocked.

diff --git a/NEWS b/NEWS
index fe5453cba223aa9d375ba2676e4b56f6c3a84f64..1e2d2ae81d1558f9cd075fc28753e645549d75e3 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -13,7 +13,7 @@ Version 2.21
   16619, 16740, 16857, 17192, 17266, 17344, 17363, 17370, 17371, 17411,
   17460, 17475, 17485, 17501, 17506, 17508, 17522, 17555, 17570, 17571,
   17572, 17573, 17574, 17581, 17582, 17583, 17584, 17585, 17589, 17594,
-  17608, 17616, 17625, 17633, 17664.
+  17608, 17616, 17625, 17633, 17664, 17665.
 
 * CVE-2104-7817 The wordexp function could ignore the WRDE_NOCMD flag
   under certain input conditions resulting in the execution of a shell for

diff --git a/posix/unistd.h b/posix/unistd.h
index ac81d92c1e8ed2a7cf823dcc1fd9a25da46884c9..59b3139ed7a0566d3846c76ca786382d5813d94c 100644 (file)
--- a/posix/unistd.h
+++ b/posix/unistd.h
@@ -880,7 +880,7 @@ extern int gethostname (char *__name, size_t __len) __THROW __nonnull ((1));
 #endif
 
 
-#if defined __USE_MISC || (defined __USE_XOPEN && !defined __USE_UNIX98)
+#if defined __USE_MISC
 /* Set the name of the current host to NAME, which is LEN bytes long.
    This call is restricted to the super-user.  */
 extern int sethostname (const char *__name, size_t __len)
@@ -935,7 +935,7 @@ extern void setusershell (void) __THROW; /* Rewind and re-read the file.  */
    terminal.  If NOCHDIR is zero, do `chdir ("/")'.  If NOCLOSE is zero,
    redirects stdin, stdout, and stderr to /dev/null.  */
 extern int daemon (int __nochdir, int __noclose) __THROW __wur;
-#endif /* Use misc || X/Open.  */
+#endif /* Use misc.  */
 
 
 #if defined __USE_MISC || (defined __USE_XOPEN && !defined __USE_XOPEN2K)