diff options
author | Joseph Myers <joseph@codesourcery.com> | 2015-06-12 20:02:30 +0000 |
---|---|---|
committer | Joseph Myers <joseph@codesourcery.com> | 2015-06-12 20:02:30 +0000 |
commit | 5371d99e8766f25864ddf20fb0866e57fc0b7991 (patch) | |
tree | 7da25c486c5cee518ba959fd05f3629a0479b253 /include | |
parent | a82a3db95077c8343b988a6f1b03adea3d40f6d4 (diff) | |
download | glibc-5371d99e8766f25864ddf20fb0866e57fc0b7991.zip glibc-5371d99e8766f25864ddf20fb0866e57fc0b7991.tar.gz glibc-5371d99e8766f25864ddf20fb0866e57fc0b7991.tar.bz2 |
Fix getlogin_r namespace (bug 18527).
Various functions in XPG4 bring in references to getlogin_r, which is
not in XPG4; this is also a bug for some older POSIX versions which
aren't yet covered by the linknamespace tests. This patch fixes this
by making getlogin_r into a weak alias for __getlogin_r and using
__getlogin_r as needed.
Tested for x86_64 and x86 (testsuite, and that disassembly of
installed stripped shared libraries is unchanged by the patch).
[BZ #18527]
* login/getlogin_r.c (getlogin_r): Rename to __getlogin_r and
define as weak alias of __getlogin_r. Use libc_hidden_weak.
* sysdeps/mach/hurd/getlogin_r.c (getlogin_r): Likewise.
* sysdeps/unix/getlogin_r.c (getlogin_r): Likewise.
* sysdeps/unix/sysv/linux/getlogin_r.c (getlogin_r): Likewise.
* include/unistd.h (__getlogin_r): Declare. Use
libc_hidden_proto.
* posix/glob.c (glob): Call __getlogin_r instead of getlogin_r.
* conform/Makefile (test-xfail-XPG3/glob.h/linknamespace): Remove
variable.
(test-xfail-XPG3/wordexp.h/linknamespace): Likewise.
(test-xfail-XPG4/glob.h/linknamespace): Likewise.
(test-xfail-XPG4/wordexp.h/linknamespace): Likewise.
Diffstat (limited to 'include')
-rw-r--r-- | include/unistd.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/unistd.h b/include/unistd.h index 762acc0..61df3af 100644 --- a/include/unistd.h +++ b/include/unistd.h @@ -14,6 +14,8 @@ libc_hidden_proto (execvp) libc_hidden_proto (getpid) libc_hidden_proto (getsid) libc_hidden_proto (getdomainname) +extern __typeof (getlogin_r) __getlogin_r __nonnull ((1)); +libc_hidden_proto (__getlogin_r) libc_hidden_proto (getlogin_r) libc_hidden_proto (seteuid) libc_hidden_proto (setegid) |