- (dtucker) [session.c] Call display_loginmsg again after do_pam_session.

Ensures messages from PAM modules are displayed when privsep=no.

Note: I did not want to just move display_loginmsg since that would change
existing behaviour (order of expiry warnings, "Last Login", motd) to less
like the native tools.
This commit is contained in:
Darren Tucker 2004-07-01 09:48:29 +10:00
parent a6b1d169e6
commit 0a44d1ecf3
2 changed files with 12 additions and 1 deletions

View File

@ -1,3 +1,7 @@
20040701
- (dtucker) [session.c] Call display_loginmsg again after do_pam_session.
Ensures messages from PAM modules are displayed when privsep=no.
20040630
- (dtucker) [auth-pam.c] Check for buggy PAM modules that return a NULL
appdata_ptr to the conversation function. ok djm@
@ -1465,4 +1469,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
$Id: ChangeLog,v 1.3463 2004/06/30 12:41:07 djm Exp $
$Id: ChangeLog,v 1.3464 2004/06/30 23:48:29 dtucker Exp $

View File

@ -1431,6 +1431,13 @@ do_child(Session *s, const char *command)
#else /* HAVE_OSF_SIA */
do_nologin(pw);
do_setusercontext(pw);
/*
* PAM session modules in do_setusercontext may have
* generated messages, so if this in an interactive
* login then display them too.
*/
if (command == NULL)
display_loginmsg();
#endif /* HAVE_OSF_SIA */
}