* NEWS, src/login.c: Log in utmp / utmpx / wtmp also when PAM is
enabled. This is not done by pam_lastlog. This was broken on 2011-07-23. * NEWS, libmisc/utmp.c: Do not log in wtmp when PAM is enabled. This is done by pam_lastlog.
This commit is contained in:
		@@ -126,12 +126,10 @@ static void usage (void);
 | 
			
		||||
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;
 | 
			
		||||
@@ -473,7 +471,6 @@ static /*@observer@*/const char *get_failent_user (/*@returned@*/const char *use
 | 
			
		||||
	return failent_user;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
#ifndef USE_PAM
 | 
			
		||||
/*
 | 
			
		||||
 * update_utmp - Update or create an utmp entry in utmp, wtmp, utmpw, and
 | 
			
		||||
 *               wtmpx
 | 
			
		||||
@@ -499,7 +496,6 @@ static void update_utmp (const char *user,
 | 
			
		||||
	free (utx);
 | 
			
		||||
#endif				/* USE_UTMPX */
 | 
			
		||||
}
 | 
			
		||||
#endif				/* ! USE_PAM */
 | 
			
		||||
 | 
			
		||||
/*
 | 
			
		||||
 * login - create a new login session for a user
 | 
			
		||||
@@ -1215,13 +1211,11 @@ int main (int argc, char **argv)
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
#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.
 | 
			
		||||
	 *
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user