diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2020-01-25 05:48:26 +0100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2020-01-25 05:51:20 +0100 |
| commit | 0ecd20bc9f0b9c7c697c9eb014613516c8f65834 (patch) | |
| tree | 537b0b832eec9db341f96d7a3cf182d4ba05b447 /serverloop.c | |
| parent | upstream: Move setting $NC into test-exec since it's now used by (diff) | |
| download | openssh-0ecd20bc9f0b9c7c697c9eb014613516c8f65834.tar.xz openssh-0ecd20bc9f0b9c7c697c9eb014613516c8f65834.zip | |
upstream: unrevert this:
> revision 1.217
> date: 2019/11/27 03:34:04; author: dtucker; state: Exp; lines: +5 -7; commitid: wkiMn49XJyjzoJIs;
> Make channel_id u_int32_t and remove unnecessary check and cast that were
> left over from the type conversion. Noted by t-hashida@amiya.co.jp in
> bz#3098, ok markus@ djm@
Darren was right the first time; ok dtucker@ "agreed" markus@
OpenBSD-Commit-ID: 641dd1b99a6bbd85b7160da462ae1be83432c7c8
Diffstat (limited to 'serverloop.c')
| -rw-r--r-- | serverloop.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/serverloop.c b/serverloop.c index 1babc7a51..e16eabe27 100644 --- a/serverloop.c +++ b/serverloop.c @@ -1,4 +1,4 @@ -/* $OpenBSD: serverloop.c,v 1.219 2020/01/23 07:10:22 dtucker Exp $ */ +/* $OpenBSD: serverloop.c,v 1.220 2020/01/25 04:48:26 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -685,9 +685,7 @@ server_input_channel_open(int type, u_int32_t seq, struct ssh *ssh) debug("%s: ctype %s rchan %u win %u max %u", __func__, ctype, rchan, rwindow, rmaxpack); - if (rchan > INT_MAX) { - error("%s: invalid remote channel ID", __func__); - } else if (strcmp(ctype, "session") == 0) { + if (strcmp(ctype, "session") == 0) { c = server_request_session(ssh); } else if (strcmp(ctype, "direct-tcpip") == 0) { c = server_request_direct_tcpip(ssh, &reason, &errmsg); @@ -698,7 +696,7 @@ server_input_channel_open(int type, u_int32_t seq, struct ssh *ssh) } if (c != NULL) { debug("%s: confirm %s", __func__, ctype); - c->remote_id = (int)rchan; + c->remote_id = rchan; c->have_remote_id = 1; c->remote_window = rwindow; c->remote_maxpacket = rmaxpack; |