commit 677257fe07dd2b9a58817e1d42fc2c25bb618a4d
author Damien Miller <djm@mindrot.org> Fri Jun 17 12:55:03 2005 +1000
committer Damien Miller <djm@mindrot.org> Fri Jun 17 12:55:03 2005 +1000
tree 087406abe9a0f12491122452ecad2b44a04d7908
parent 17e7ed0e754577ae61cdd5e3f03b33fba2a09337

   - markus@cvs.openbsd.org 2005/06/16 08:00:00
     [canohost.c channels.c sshd.c]
     don't exit if getpeername fails for forwarded ports; bugzilla #1054;
     ok djm

channels.c

diff --git a/channels.c b/channels.c
index 440043b..66b15f5 100644
--- a/channels.c
+++ b/channels.c
@@ -39,7 +39,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: channels.c,v 1.215 2005/06/16 03:38:36 djm Exp $");
+RCSID("$OpenBSD: channels.c,v 1.216 2005/06/16 08:00:00 markus Exp $");
 
 #include "ssh.h"
 #include "ssh1.h"
@@ -1178,7 +1178,7 @@
 	int direct;
 	char buf[1024];
 	char *remote_ipaddr = get_peer_ipaddr(c->sock);
-	u_short remote_port = get_peer_port(c->sock);
+	int remote_port = get_peer_port(c->sock);
 
 	direct = (strcmp(rtype, "direct-tcpip") == 0);
 
@@ -1208,7 +1208,7 @@
 		}
 		/* originator host and port */
 		packet_put_cstring(remote_ipaddr);
-		packet_put_int(remote_port);
+		packet_put_int((u_int)remote_port);
 		packet_send();
 	} else {
 		packet_start(SSH_MSG_PORT_OPEN);