[Pkg-shadow-commits] r2596 - in upstream/trunk: . libmisc
Nicolas FRANCOIS
nekral-guest at alioth.debian.org
Sun Apr 5 22:33:00 UTC 2009
Author: nekral-guest
Date: 2009-04-05 22:33:00 +0000 (Sun, 05 Apr 2009)
New Revision: 2596
Modified:
upstream/trunk/ChangeLog
upstream/trunk/libmisc/setugid.c
Log:
* 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.
Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog 2009-04-05 22:29:42 UTC (rev 2595)
+++ upstream/trunk/ChangeLog 2009-04-05 22:33:00 UTC (rev 2596)
@@ -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 <nicolas.francois at centraliens.net>
* src/passwd.c: do_update_age is only used ifndef USE_PAM. Make it
Modified: upstream/trunk/libmisc/setugid.c
===================================================================
--- upstream/trunk/libmisc/setugid.c 2009-04-05 22:29:42 UTC (rev 2595)
+++ upstream/trunk/libmisc/setugid.c 2009-04-05 22:33:00 UTC (rev 2596)
@@ -108,13 +108,17 @@
* 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 @@
perror ("Warning: add_groups");
}
}
-#endif /* HAVE_INITGROUPS */
+#endif /* HAVE_INITGROUPS && !USE_PAM*/
if (change_uid (info) < 0) {
return -1;
More information about the Pkg-shadow-commits
mailing list