[Pkg-shadow-commits] r3438 - in upstream/trunk: . src

[Nicolas FRANÇOIS]

Author: nekral-guest
Date: 2011-07-23 11:03:50 +0000 (Sat, 23 Jul 2011)
New Revision: 3438

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/NEWS
   upstream/trunk/src/login.c
Log:
	* NEWS, src/login.c: Do not log in utmp / utmpx / wtmp when PAM is
	enabled. This is already done by pam_lastlog.


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2011-07-23 08:14:15 UTC (rev 3437)
+++ upstream/trunk/ChangeLog	2011-07-23 11:03:50 UTC (rev 3438)
@@ -1,5 +1,10 @@
 2011-07-23  Nicolas François  <nicolas.francois at centraliens.net>
 
+	* NEWS, src/login.c: Do not log in utmp / utmpx / wtmp when PAM is
+	enabled. This is already done by pam_lastlog.
+
+2011-07-23  Nicolas François  <nicolas.francois at centraliens.net>
+
 	* src/chpasswd.c: Add annotations to indicate that usage() does
 	not return.
 	* src/chpasswd.c: Reindent.

Modified: upstream/trunk/NEWS
===================================================================
--- upstream/trunk/NEWS	2011-07-23 08:14:15 UTC (rev 3437)
+++ upstream/trunk/NEWS	2011-07-23 11:03:50 UTC (rev 3438)
@@ -39,6 +39,8 @@
     list of TTYs.
   * Fixed warning and support for CONSOLE_GROUPS for users member of more
     than 16 groups.
+  * Do not log into utmp(x) or wtmp when PAM is enabled. This is done by
+    pam_lastlog.
 - su
   * Document the su exit values.
   * When su receives a signal, wait for the child to terminate (after

Modified: upstream/trunk/src/login.c
===================================================================
--- upstream/trunk/src/login.c	2011-07-23 08:14:15 UTC (rev 3437)
+++ upstream/trunk/src/login.c	2011-07-23 11:03:50 UTC (rev 3438)
@@ -126,10 +126,12 @@
 static void setup_tty (void);
 static void process_flags (int argc, char *const *argv);
 static /*@observer@*/const char *get_failent_user (/*@returned@*/const char *user);
+#ifndef USE_PAM
 static void update_utmp (const char *user,
                          const char *tty,
                          const char *host,
                          /*@null@*/const struct utmp *utent);
+#endif				/* ! USE_PAM */
 
 #ifndef USE_PAM
 static struct faillog faillog;
@@ -471,6 +473,7 @@
 	return failent_user;
 }
 
+#ifndef USE_PAM
 /*
  * update_utmp - Update or create an utmp entry in utmp, wtmp, utmpw, and
  *               wtmpx
@@ -496,6 +499,7 @@
 	free (utx);
 #endif				/* USE_UTMPX */
 }
+#endif				/* ! USE_PAM */
 
 /*
  * login - create a new login session for a user
@@ -1208,11 +1212,13 @@
 		}
 	}
 
+#ifndef USE_PAM
 	/*
 	 * The utmp entry needs to be updated to indicate the new status
 	 * of the session, the new PID and SID.
 	 */
 	update_utmp (username, tty, hostname, utent);
+#endif				/* ! USE_PAM */
 
 	/* The pwd and spwd entries for the user have been copied.
 	 *