summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2010-01-30 17:28:34 +1100
committerDamien Miller <djm@mindrot.org>2010-01-30 17:28:34 +1100
commit36f57ebf3b5ecf697c5ae868dbc0992792890e06 (patch)
tree54ea0f645e36ae03e64326967d7629d6359691e7
parent19d32cb9348baec8e86bb4b19de513ff8d7fa3ce (diff)
- djm@cvs.openbsd.org 2010/01/28 00:21:18
[clientloop.c] downgrade an error() to a debug() - this particular case can be hit in normal operation for certain sequences of mux slave vs session closure and is harmless
-rw-r--r--ChangeLog8
-rw-r--r--clientloop.c7
2 files changed, 12 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 8e427cc4..f9a84fdd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+20100130
+ - (djm) OpenBSD CVS Sync
+ - djm@cvs.openbsd.org 2010/01/28 00:21:18
+ [clientloop.c]
+ downgrade an error() to a debug() - this particular case can be hit in
+ normal operation for certain sequences of mux slave vs session closure
+ and is harmless
+
20100129
- (dtucker) [openbsd-compat/openssl-compat.c] Bug #1707: Call OPENSSL_config()
after registering the hardware engines, which causes the openssl.cnf file to
diff --git a/clientloop.c b/clientloop.c
index 05f4720a..6ffef95a 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: clientloop.c,v 1.217 2010/01/26 01:28:35 djm Exp $ */
+/* $OpenBSD: clientloop.c,v 1.218 2010/01/28 00:21:18 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* 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)
success = 1;
exit_status = exitval;
} else {
- error("client_input_channel_req: unexpected channel %d",
- session_ident);
+ /* Probably for a mux channel that has already closed */
+ debug("%s: no sink for exit-status on channel %d",
+ __func__, id);
}
packet_check_eom();
}