0004cc46dd
The separation was unnecessary, and caused build problems. Let's go wild and obliterate the library. The files are moved to libshadow. Scripted change: $ find libmisc/ -type f \ | grep '\.[chy]$' \ | xargs mv -t lib; Plus updating the Makefile and other references. While at it, I've sorted the sources lists. Link: <https://github.com/shadow-maint/shadow/pull/792> Reported-by: David Seifert <soap@gentoo.org> Cc: Sam James <sam@gentoo.org> Cc: Christian Bricart <christian@bricart.de> Cc: Michael Vetter <jubalh@iodoru.org> Cc: Robert Förster <Dessa@gmake.de> [ soap tested the Gentoo package ] Tested-by: David Seifert <soap@gentoo.org> Acked-by: David Seifert <soap@gentoo.org> Acked-by: Serge Hallyn <serge@hallyn.com> Acked-by: Iker Pedrosa <ipedrosa@redhat.com> Acked-by: <lslebodn@fedoraproject.org> Signed-off-by: Alejandro Colomar <alx@kernel.org>
50 lines
1.2 KiB
C
50 lines
1.2 KiB
C
/*
|
|
* SPDX-FileCopyrightText: 1996 - 1997, Marek Michałkiewicz
|
|
* SPDX-FileCopyrightText: 2003 - 2005, Tomasz Kłoczko
|
|
* SPDX-FileCopyrightText: 2007 - 2009, Nicolas François
|
|
*
|
|
* SPDX-License-Identifier: BSD-3-Clause
|
|
*/
|
|
|
|
/*
|
|
* myname.c - determine the current username and get the passwd entry
|
|
*
|
|
*/
|
|
|
|
#include <config.h>
|
|
|
|
#ident "$Id$"
|
|
|
|
#include "defines.h"
|
|
#include <pwd.h>
|
|
#include "prototypes.h"
|
|
/*@null@*/ /*@only@*/struct passwd *get_my_pwent (void)
|
|
{
|
|
struct passwd *pw;
|
|
const char *cp = getlogin ();
|
|
uid_t ruid = getuid ();
|
|
|
|
/*
|
|
* Try getlogin() first - if it fails or returns a non-existent
|
|
* username, or a username which doesn't match the real UID, fall
|
|
* back to getpwuid(getuid()). This should work reasonably with
|
|
* usernames longer than the utmp limit (8 characters), as well as
|
|
* shared UIDs - but not both at the same time...
|
|
*
|
|
* XXX - when running from su, will return the current user (not
|
|
* the original user, like getlogin() does). Does this matter?
|
|
*/
|
|
if ((NULL != cp) && ('\0' != *cp)) {
|
|
pw = xgetpwnam (cp);
|
|
if ((NULL != pw) && (pw->pw_uid == ruid)) {
|
|
return pw;
|
|
}
|
|
if (NULL != pw) {
|
|
pw_free (pw);
|
|
}
|
|
}
|
|
|
|
return xgetpwuid (ruid);
|
|
}
|
|
|