diff options
| author | Darren Tucker <dtucker@zip.com.au> | 2008-07-02 22:32:14 +1000 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2008-07-02 22:32:14 +1000 |
| commit | 8810dd41b9c5903452badac57aee3dee24c20be5 (patch) | |
| tree | 9d43338db0677ea5ce69c0abf55cf385eb565fea | |
| parent | 00f00f0451087cf8593f11758e0973fa7d9349bc (diff) | |
- djm@cvs.openbsd.org 2008/06/30 12:15:39
[serverloop.c]
only pass channel requests on session channels through to the session
channel handler, avoiding spurious log messages; ok! markus@
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | serverloop.c | 5 |
2 files changed, 8 insertions, 3 deletions
@@ -3,6 +3,10 @@ - djm@cvs.openbsd.org 2008/06/30 08:05:59 [PROTOCOL.agent] typo: s/constraint_date/constraint_data/ + - djm@cvs.openbsd.org 2008/06/30 12:15:39 + [serverloop.c] + only pass channel requests on session channels through to the session + channel handler, avoiding spurious log messages; ok! markus@ 20080630 - (djm) OpenBSD CVS Sync @@ -4486,4 +4490,4 @@ OpenServer 6 and add osr5bigcrypt support so when someone migrates passwords between UnixWare and OpenServer they will still work. OK dtucker@ -$Id: ChangeLog,v 1.5039 2008/07/02 12:31:31 dtucker Exp $ +$Id: ChangeLog,v 1.5040 2008/07/02 12:32:14 dtucker Exp $ diff --git a/serverloop.c b/serverloop.c index ab4bf84a..bd6f82dc 100644 --- a/serverloop.c +++ b/serverloop.c @@ -1,4 +1,4 @@ -/* $OpenBSD: serverloop.c,v 1.152 2008/06/10 22:15:23 djm Exp $ */ +/* $OpenBSD: serverloop.c,v 1.153 2008/06/30 12:15:39 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -1173,7 +1173,8 @@ server_input_channel_req(int type, u_int32_t seq, void *ctxt) if (!strcmp(rtype, "eow@openssh.com")) { packet_check_eom(); chan_rcvd_eow(c); - } else if (c->type == SSH_CHANNEL_LARVAL || c->type == SSH_CHANNEL_OPEN) + } else if ((c->type == SSH_CHANNEL_LARVAL || + c->type == SSH_CHANNEL_OPEN) && strcmp(c->ctype, "session") == 0) success = session_input_channel_req(c, rtype); if (reply) { packet_start(success ? |