AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-12-23 11:20:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

More fixes to error handling in getlogin_r.

Browse Source
This commit is contained in:
Andreas Schwab 2010-06-21 07:57:12 -07:00 committed by Ulrich Drepper
parent ac2b484c02
commit e35fcef8b7
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2010-06-21 Andreas Schwab <schwab@redhat.com>
* sysdeps/unix/sysv/linux/getlogin_r.c (__getlogin_r_loginuid):
Restore proper fallback handling.
2010-06-19 Ulrich Drepper <drepper@redhat.com> 2010-06-19 Ulrich Drepper <drepper@redhat.com>
[BZ #11701] [BZ #11701]

8
sysdeps/unix/sysv/linux/getlogin_r.c
View File

@ -27,6 +27,10 @@ static int getlogin_r_fd0 (char *name, size_t namesize);
#undef getlogin_r #undef getlogin_r
/* Try to determine login name from /proc/self/loginuid and return 0
if successful. If /proc/self/loginuid cannot be read return -1.
Otherwise return the error number. */
int int
attribute_hidden attribute_hidden
__getlogin_r_loginuid (name, namesize) __getlogin_r_loginuid (name, namesize)
@ -35,7 +39,7 @@ __getlogin_r_loginuid (name, namesize)
{ {
int fd = open_not_cancel_2 ("/proc/self/loginuid", O_RDONLY); int fd = open_not_cancel_2 ("/proc/self/loginuid", O_RDONLY);
if (fd == -1) if (fd == -1)
return 1; return -1;
/* We are reading a 32-bit number. 12 bytes are enough for the text /* We are reading a 32-bit number. 12 bytes are enough for the text
representation. If not, something is wrong. */ representation. If not, something is wrong. */
@ -51,7 +55,7 @@ __getlogin_r_loginuid (name, namesize)
|| (uidbuf[n] = '\0', || (uidbuf[n] = '\0',
uid = strtoul (uidbuf, &endp, 10), uid = strtoul (uidbuf, &endp, 10),
endp == uidbuf || *endp != '\0')) endp == uidbuf || *endp != '\0'))
return 1; return -1;
size_t buflen = 1024; size_t buflen = 1024;
char *buf = alloca (buflen); char *buf = alloca (buflen);