summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--clientloop.c7
2 files changed, 12 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 8e427cc41..f9a84fddf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
120100130
2 - (djm) OpenBSD CVS Sync
3 - djm@cvs.openbsd.org 2010/01/28 00:21:18
4 [clientloop.c]
5 downgrade an error() to a debug() - this particular case can be hit in
6 normal operation for certain sequences of mux slave vs session closure
7 and is harmless
8
120100129 920100129
2 - (dtucker) [openbsd-compat/openssl-compat.c] Bug #1707: Call OPENSSL_config() 10 - (dtucker) [openbsd-compat/openssl-compat.c] Bug #1707: Call OPENSSL_config()
3 after registering the hardware engines, which causes the openssl.cnf file to 11 after registering the hardware engines, which causes the openssl.cnf file to
diff --git a/clientloop.c b/clientloop.c
index 05f4720a1..6ffef95a2 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: clientloop.c,v 1.217 2010/01/26 01:28:35 djm Exp $ */ 1/* $OpenBSD: clientloop.c,v 1.218 2010/01/28 00:21:18 djm Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1857,8 +1857,9 @@ client_input_channel_req(int type, u_int32_t seq, void *ctxt)
1857 success = 1; 1857 success = 1;
1858 exit_status = exitval; 1858 exit_status = exitval;
1859 } else { 1859 } else {
1860 error("client_input_channel_req: unexpected channel %d", 1860 /* Probably for a mux channel that has already closed */
1861 session_ident); 1861 debug("%s: no sink for exit-status on channel %d",
1862 __func__, id);
1862 } 1863 }
1863 packet_check_eom(); 1864 packet_check_eom();
1864 } 1865 }