From ac52639b7756591d686eb76234fd2db2a35264bb Mon Sep 17 00:00:00 2001 From: nekral-guest Date: Sun, 5 Apr 2009 22:33:00 +0000 Subject: [PATCH] * libmisc/setugid.c libmisc/age.c (setup_uid_gid): is_console is 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. --- ChangeLog | 10 ++++++---- libmisc/setugid.c | 8 ++++++-- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index cff4162d..c7ef7a7d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,13 +4,15 @@ ifndef USE_PAM. * lib/prototypes.h: Remove the declaration of add_cons_grps(). The function does not exist. - * libmisc/age.c (setup_uid_gid): is_console is 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. + * libmisc/setugid.c libmisc/age.c (setup_uid_gid): is_console is + 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. * libmisc/pwd2spwd.c (pwd_to_spwd): pwd_to_spwd() is not used in PAM builds. + 2009-04-05 Nicolas François * src/passwd.c: do_update_age is only used ifndef USE_PAM. Make it diff --git a/libmisc/setugid.c b/libmisc/setugid.c index be0d7163..80c5f6dc 100644 --- a/libmisc/setugid.c +++ b/libmisc/setugid.c @@ -108,13 +108,17 @@ int change_uid (const struct passwd *info) * 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) +#else +int setup_uid_gid (const struct passwd *info) +#endif { if (setup_groups (info) < 0) { return -1; } -#ifdef HAVE_INITGROUPS +#if defined (HAVE_INITGROUPS) && ! defined (USE_PAM) if (is_console) { 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"); } } -#endif /* HAVE_INITGROUPS */ +#endif /* HAVE_INITGROUPS && !USE_PAM*/ if (change_uid (info) < 0) { return -1; -- 2.40.0