* [PATCH] getlogin_r: fix missing fallback if loginuid is unset (bug 30235)
@ 2023-03-30 11:09 Andreas Schwab
2023-03-30 11:33 ` Dmitry V. Levin
0 siblings, 1 reply; 2+ messages in thread
From: Andreas Schwab @ 2023-03-30 11:09 UTC (permalink / raw)
To: libc-alpha
When /proc/self/loginuid is not set, we should still fall back to using
the traditional utmp lookup, instead of failing right away.
---
sysdeps/unix/sysv/linux/getlogin_r.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/sysdeps/unix/sysv/linux/getlogin_r.c b/sysdeps/unix/sysv/linux/getlogin_r.c
index 879df85a16..4ae9a53503 100644
--- a/sysdeps/unix/sysv/linux/getlogin_r.c
+++ b/sysdeps/unix/sysv/linux/getlogin_r.c
@@ -59,10 +59,7 @@ __getlogin_r_loginuid (char *name, size_t namesize)
value of, (uid_t) -1, so check if that value is set and return early to
avoid making unneeded nss lookups. */
if (uid == (uid_t) -1)
- {
- __set_errno (ENXIO);
- return ENXIO;
- }
+ return -1;
struct passwd pwd;
struct passwd *tpwd;
--
2.40.0
--
Andreas Schwab, SUSE Labs, schwab@suse.de
GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE 1748 E4D4 88E3 0EEA B9D7
"And now for something completely different."
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] getlogin_r: fix missing fallback if loginuid is unset (bug 30235)
2023-03-30 11:09 [PATCH] getlogin_r: fix missing fallback if loginuid is unset (bug 30235) Andreas Schwab
@ 2023-03-30 11:33 ` Dmitry V. Levin
0 siblings, 0 replies; 2+ messages in thread
From: Dmitry V. Levin @ 2023-03-30 11:33 UTC (permalink / raw)
To: libc-alpha
On Thu, Mar 30, 2023 at 01:09:24PM +0200, Andreas Schwab via Libc-alpha wrote:
> When /proc/self/loginuid is not set, we should still fall back to using
> the traditional utmp lookup, instead of failing right away.
> ---
> sysdeps/unix/sysv/linux/getlogin_r.c | 5 +----
> 1 file changed, 1 insertion(+), 4 deletions(-)
>
> diff --git a/sysdeps/unix/sysv/linux/getlogin_r.c b/sysdeps/unix/sysv/linux/getlogin_r.c
> index 879df85a16..4ae9a53503 100644
> --- a/sysdeps/unix/sysv/linux/getlogin_r.c
> +++ b/sysdeps/unix/sysv/linux/getlogin_r.c
> @@ -59,10 +59,7 @@ __getlogin_r_loginuid (char *name, size_t namesize)
> value of, (uid_t) -1, so check if that value is set and return early to
> avoid making unneeded nss lookups. */
> if (uid == (uid_t) -1)
> - {
> - __set_errno (ENXIO);
> - return ENXIO;
> - }
> + return -1;
>
> struct passwd pwd;
> struct passwd *tpwd;
LGTM, thanks.
--
ldv
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-03-30 11:33 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-03-30 11:09 [PATCH] getlogin_r: fix missing fallback if loginuid is unset (bug 30235) Andreas Schwab
2023-03-30 11:33 ` Dmitry V. Levin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).