emo/shadow
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

* libmisc/setugid.c libmisc/age.c (setup_uid_gid): is_console is

Browse Source 
never set ifndef USE_PAM. Change the prototype of setup_uid_gid()
	when USE_PAM is not defined. This permits to remove add_groups
	from PAM builds.  setup_uid_gid is already subject to
	HAVE_INITGROUPS.
This commit is contained in:
nekral-guest 2009-04-05 22:33:00 +00:00
parent a51954203e
commit ac52639b77
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -4,13 +4,15 @@
ifndef USE_PAM. ifndef USE_PAM.
* lib/prototypes.h: Remove the declaration of add_cons_grps(). The * lib/prototypes.h: Remove the declaration of add_cons_grps(). The
function does not exist. function does not exist.
* libmisc/age.c (setup_uid_gid): is_console is never set ifndef * libmisc/setugid.c libmisc/age.c (setup_uid_gid): is_console is
USE_PAM. Change the prototype of setup_uid_gid() when USE_PAM is never set ifndef USE_PAM. Change the prototype of setup_uid_gid()
not defined. This permits to remove add_groups from PAM builds. when USE_PAM is not defined. This permits to remove add_groups
setup_uid_gid is already subject to HAVE_INITGROUPS. from PAM builds. setup_uid_gid is already subject to
HAVE_INITGROUPS.
* libmisc/pwd2spwd.c (pwd_to_spwd): pwd_to_spwd() is not used in * libmisc/pwd2spwd.c (pwd_to_spwd): pwd_to_spwd() is not used in
PAM builds. PAM builds.
2009-04-05 Nicolas François <nicolas.francois@centraliens.net> 2009-04-05 Nicolas François <nicolas.francois@centraliens.net>
* src/passwd.c: do_update_age is only used ifndef USE_PAM. Make it * src/passwd.c: do_update_age is only used ifndef USE_PAM. Make it

8
libmisc/setugid.c
View File

@ -108,13 +108,17 @@ int change_uid (const struct passwd *info)
* Returns 0 on success, or -1 on failure. * Returns 0 on success, or -1 on failure.
*/ */
#if defined (HAVE_INITGROUPS) && ! (defined USE_PAM)
int setup_uid_gid (const struct passwd *info, bool is_console) int setup_uid_gid (const struct passwd *info, bool is_console)
#else
int setup_uid_gid (const struct passwd *info)
#endif
{ {
if (setup_groups (info) < 0) { if (setup_groups (info) < 0) {
return -1; return -1;
} }
#ifdef HAVE_INITGROUPS #if defined (HAVE_INITGROUPS) && ! defined (USE_PAM)
if (is_console) { if (is_console) {
char *cp = getdef_str ("CONSOLE_GROUPS"); char *cp = getdef_str ("CONSOLE_GROUPS");
@ -122,7 +126,7 @@ int setup_uid_gid (const struct passwd *info, bool is_console)
perror ("Warning: add_groups"); perror ("Warning: add_groups");
} }
} }
#endif /* HAVE_INITGROUPS */ #endif /* HAVE_INITGROUPS && !USE_PAM*/
if (change_uid (info) < 0) { if (change_uid (info) < 0) {
return -1; return -1;