[openssh-commits] [openssh] 01/01: upstream: unrevert this:

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

commit 0ecd20bc9f0b9c7c697c9eb014613516c8f65834
Author: djm at openbsd.org <djm at openbsd.org>
Date:   Sat Jan 25 04:48:26 2020 +0000

    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 at amiya.co.jp in
    > bz#3098, ok markus@ djm@
    
    Darren was right the first time; ok dtucker@ "agreed" markus@
    
    OpenBSD-Commit-ID: 641dd1b99a6bbd85b7160da462ae1be83432c7c8
---
 serverloop.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/serverloop.c b/serverloop.c
index 1babc7a5..e16eabe2 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 at cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo at 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;

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.