summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2004-08-12 23:08:14 +1000
committerDarren Tucker <dtucker@zip.com.au>2004-08-12 23:08:14 +1000
commiteb57862e7c4be89ccb0428298e9737ff7e2398f9 (patch)
tree743949fca24c305d554a6c6166966fb226a6bb86
parent133b757357fe78893327494afb8db113a6ad53a8 (diff)
- (dtucker) [sshd.c] Clear loginmsg in postauth monitor, prevents doubling
messages generated before the postauth privsep split.
-rw-r--r--ChangeLog4
-rw-r--r--sshd.c1
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index e78d2f124..3a661ec69 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -25,6 +25,8 @@
25 - djm@cvs.openbsd.org 2004/08/11 12:01:16 25 - djm@cvs.openbsd.org 2004/08/11 12:01:16
26 [sshlogin.c] 26 [sshlogin.c]
27 make store_lastlog_message() static to appease -Wall; ok markus 27 make store_lastlog_message() static to appease -Wall; ok markus
28 - (dtucker) [sshd.c] Clear loginmsg in postauth monitor, prevents doubling
29 messages generated before the postauth privsep split.
28 30
2920040720 3120040720
30 - (djm) OpenBSD CVS Sync 32 - (djm) OpenBSD CVS Sync
@@ -1592,4 +1594,4 @@
1592 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 1594 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
1593 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 1595 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
1594 1596
1595$Id: ChangeLog,v 1.3496 2004/08/12 12:50:03 dtucker Exp $ 1597$Id: ChangeLog,v 1.3497 2004/08/12 13:08:14 dtucker Exp $
diff --git a/sshd.c b/sshd.c
index e3acbcc81..60f63ef7b 100644
--- a/sshd.c
+++ b/sshd.c
@@ -659,6 +659,7 @@ privsep_postauth(Authctxt *authctxt)
659 else if (pmonitor->m_pid != 0) { 659 else if (pmonitor->m_pid != 0) {
660 debug2("User child is on pid %ld", (long)pmonitor->m_pid); 660 debug2("User child is on pid %ld", (long)pmonitor->m_pid);
661 close(pmonitor->m_recvfd); 661 close(pmonitor->m_recvfd);
662 buffer_clear(&loginmsg);
662 monitor_child_postauth(pmonitor); 663 monitor_child_postauth(pmonitor);
663 664
664 /* NEVERREACHED */ 665 /* NEVERREACHED */