summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2004-03-27 16:44:21 +1100
committerDarren Tucker <dtucker@zip.com.au>2004-03-27 16:44:21 +1100
commitb385059346a6011fab3bc293a82636e391bb03cc (patch)
treea71f7d84484888fd0834fb1cdaafc1d5bff2fc84
parent154e8b82ef2f28438c7978a9c2d3f9a1fe0cfd65 (diff)
- (dtucker) [session.c] Bug #817: Clear loginmsg after fork to prevent
duplicate login messages for mutli-session logins. ok djm@
-rw-r--r--ChangeLog6
-rw-r--r--session.c7
2 files changed, 12 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 8de7fe330..72d15e12b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
120040327
2 - (dtucker) [session.c] Bug #817: Clear loginmsg after fork to prevent
3 duplicate login messages for mutli-session logins. ok djm@
4
120040322 520040322
2 - (djm) [sshd.c] Drop supplemental groups if started as root 6 - (djm) [sshd.c] Drop supplemental groups if started as root
3 - (djm) OpenBSD CVS Sync 7 - (djm) OpenBSD CVS Sync
@@ -918,4 +922,4 @@
918 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 922 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
919 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 923 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
920 924
921$Id: ChangeLog,v 1.3295 2004/03/21 22:40:01 djm Exp $ 925$Id: ChangeLog,v 1.3296 2004/03/27 05:44:21 dtucker Exp $
diff --git a/session.c b/session.c
index af2e71992..6ab3484e2 100644
--- a/session.c
+++ b/session.c
@@ -492,6 +492,13 @@ do_exec_no_pty(Session *s, const char *command)
492 close(err[0]); 492 close(err[0]);
493 493
494 /* 494 /*
495 * Clear loginmsg, since it's the child's responsibility to display
496 * it to the user, otherwise multiple sessions may accumulate
497 * multiple copies of the login messages.
498 */
499 buffer_clear(&loginmsg);
500
501 /*
495 * Enter the interactive session. Note: server_loop must be able to 502 * Enter the interactive session. Note: server_loop must be able to
496 * handle the case that fdin and fdout are the same. 503 * handle the case that fdin and fdout are the same.
497 */ 504 */