summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--session.c7
2 files changed, 12 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 9b90db35d..f47b68ea5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
120040701
2 - (dtucker) [session.c] Call display_loginmsg again after do_pam_session.
3 Ensures messages from PAM modules are displayed when privsep=no.
4
120040630 520040630
2 - (dtucker) [auth-pam.c] Check for buggy PAM modules that return a NULL 6 - (dtucker) [auth-pam.c] Check for buggy PAM modules that return a NULL
3 appdata_ptr to the conversation function. ok djm@ 7 appdata_ptr to the conversation function. ok djm@
@@ -1465,4 +1469,4 @@
1465 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 1469 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
1466 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 1470 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
1467 1471
1468$Id: ChangeLog,v 1.3463 2004/06/30 12:41:07 djm Exp $ 1472$Id: ChangeLog,v 1.3464 2004/06/30 23:48:29 dtucker Exp $
diff --git a/session.c b/session.c
index cf2098931..a3a7ee784 100644
--- a/session.c
+++ b/session.c
@@ -1431,6 +1431,13 @@ do_child(Session *s, const char *command)
1431#else /* HAVE_OSF_SIA */ 1431#else /* HAVE_OSF_SIA */
1432 do_nologin(pw); 1432 do_nologin(pw);
1433 do_setusercontext(pw); 1433 do_setusercontext(pw);
1434 /*
1435 * PAM session modules in do_setusercontext may have
1436 * generated messages, so if this in an interactive
1437 * login then display them too.
1438 */
1439 if (command == NULL)
1440 display_loginmsg();
1434#endif /* HAVE_OSF_SIA */ 1441#endif /* HAVE_OSF_SIA */
1435 } 1442 }
1436 1443