diff options
| author |   djm <djm@openbsd.org> | 2020-01-25 04:48:26 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2020-01-25 04:48:26 +0000 |
| commit | 2ac1e846c969ff590909dceb0748af5af9899139 (patch) | |
| tree | 87725d7e3438fe625d3b7741a665584686a3fdfa /usr.bin/ssh/serverloop.c | |
| parent | Move setting $NC into test-exec since it's now used by multiple tests, (diff) | |
| download | wireguard-openbsd-2ac1e846c969ff590909dceb0748af5af9899139.tar.xz wireguard-openbsd-2ac1e846c969ff590909dceb0748af5af9899139.zip | |
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@
Diffstat (limited to 'usr.bin/ssh/serverloop.c')
| -rw-r--r-- | usr.bin/ssh/serverloop.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/usr.bin/ssh/serverloop.c b/usr.bin/ssh/serverloop.c index 1dc56dff193..f4e957aaf36 100644 --- a/usr.bin/ssh/serverloop.c +++ b/usr.bin/ssh/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 @@ -675,9 +675,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); @@ -688,7 +686,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; |