diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | serverloop.c | 5 |
2 files changed, 8 insertions, 3 deletions
@@ -3,6 +3,10 @@ | |||
3 | - djm@cvs.openbsd.org 2008/06/30 08:05:59 | 3 | - djm@cvs.openbsd.org 2008/06/30 08:05:59 |
4 | [PROTOCOL.agent] | 4 | [PROTOCOL.agent] |
5 | typo: s/constraint_date/constraint_data/ | 5 | typo: s/constraint_date/constraint_data/ |
6 | - djm@cvs.openbsd.org 2008/06/30 12:15:39 | ||
7 | [serverloop.c] | ||
8 | only pass channel requests on session channels through to the session | ||
9 | channel handler, avoiding spurious log messages; ok! markus@ | ||
6 | 10 | ||
7 | 20080630 | 11 | 20080630 |
8 | - (djm) OpenBSD CVS Sync | 12 | - (djm) OpenBSD CVS Sync |
@@ -4486,4 +4490,4 @@ | |||
4486 | OpenServer 6 and add osr5bigcrypt support so when someone migrates | 4490 | OpenServer 6 and add osr5bigcrypt support so when someone migrates |
4487 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ | 4491 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ |
4488 | 4492 | ||
4489 | $Id: ChangeLog,v 1.5039 2008/07/02 12:31:31 dtucker Exp $ | 4493 | $Id: ChangeLog,v 1.5040 2008/07/02 12:32:14 dtucker Exp $ |
diff --git a/serverloop.c b/serverloop.c index ab4bf84af..bd6f82dc1 100644 --- a/serverloop.c +++ b/serverloop.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: serverloop.c,v 1.152 2008/06/10 22:15:23 djm Exp $ */ | 1 | /* $OpenBSD: serverloop.c,v 1.153 2008/06/30 12:15:39 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 |
@@ -1173,7 +1173,8 @@ server_input_channel_req(int type, u_int32_t seq, void *ctxt) | |||
1173 | if (!strcmp(rtype, "eow@openssh.com")) { | 1173 | if (!strcmp(rtype, "eow@openssh.com")) { |
1174 | packet_check_eom(); | 1174 | packet_check_eom(); |
1175 | chan_rcvd_eow(c); | 1175 | chan_rcvd_eow(c); |
1176 | } else if (c->type == SSH_CHANNEL_LARVAL || c->type == SSH_CHANNEL_OPEN) | 1176 | } else if ((c->type == SSH_CHANNEL_LARVAL || |
1177 | c->type == SSH_CHANNEL_OPEN) && strcmp(c->ctype, "session") == 0) | ||
1177 | success = session_input_channel_req(c, rtype); | 1178 | success = session_input_channel_req(c, rtype); |
1178 | if (reply) { | 1179 | if (reply) { |
1179 | packet_start(success ? | 1180 | packet_start(success ? |