Attachment 989 Details for Bug 1012 – Updated and tweaked patch

[patch] Updated and tweaked patch

rfwd-compat.diff (text/plain), 1.96 KB, created by Damien Miller on 2005-10-12 22:29:24 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Damien Miller

Created: 2005-10-12 22:29:24 AEST

Size: 1.96 KB

patch

obsolete

>Index: channels.c
>===================================================================
>RCS file: /cvs/src/usr.bin/ssh/channels.c,v
>retrieving revision 1.226
>diff -u -p -r1.226 channels.c
>--- channels.c	11 Oct 2005 23:37:37 -0000	1.226
>+++ channels.c	12 Oct 2005 12:27:11 -0000
>@@ -2378,9 +2378,15 @@ channel_request_remote_forwarding(const 
> 	if (compat20) {
> 		const char *address_to_bind;
> 		if (listen_host == NULL)
>-			address_to_bind = "localhost";
>+			if (datafellows & SSH_BUG_RFWD_ADDR)
>+				address_to_bind = "127.0.0.1";
>+			else
>+				address_to_bind = "localhost";
> 		else if (*listen_host == '\0' || strcmp(listen_host, "*") == 0)
>-			address_to_bind = "";
>+			if (datafellows & SSH_BUG_RFWD_ADDR)
>+				address_to_bind = "0.0.0.0";
>+			else
>+				address_to_bind = "";
> 		else
> 			address_to_bind = listen_host;
> 
>Index: compat.c
>===================================================================
>RCS file: /cvs/src/usr.bin/ssh/compat.c,v
>retrieving revision 1.71
>diff -u -p -r1.71 compat.c
>--- compat.c	1 Mar 2005 10:09:52 -0000	1.71
>+++ compat.c	12 Oct 2005 12:27:11 -0000
>@@ -127,7 +127,8 @@ compat_datafellows(const char *version)
> 		{ "2.3.*",		SSH_BUG_DEBUG|SSH_BUG_RSASIGMD5|
> 					SSH_BUG_FIRSTKEX },
> 		{ "2.4",		SSH_OLD_SESSIONID },	/* Van Dyke */
>-		{ "2.*",		SSH_BUG_DEBUG|SSH_BUG_FIRSTKEX },
>+		{ "2.*",		SSH_BUG_DEBUG|SSH_BUG_FIRSTKEX|
>+					SSH_BUG_RFWD_ADDR },
> 		{ "3.0.*",		SSH_BUG_DEBUG },
> 		{ "3.0 SecureCRT*",	SSH_OLD_SESSIONID },
> 		{ "1.7 SecureFX*",	SSH_OLD_SESSIONID },
>Index: compat.h
>===================================================================
>RCS file: /cvs/src/usr.bin/ssh/compat.h,v
>retrieving revision 1.39
>diff -u -p -r1.39 compat.h
>--- compat.h	1 Mar 2005 10:09:52 -0000	1.39
>+++ compat.h	12 Oct 2005 12:27:11 -0000
>@@ -56,6 +56,7 @@
> #define SSH_BUG_PROBE		0x00400000
> #define SSH_BUG_FIRSTKEX	0x00800000
> #define SSH_OLD_FORWARD_ADDR	0x01000000
>+#define SSH_BUG_RFWD_ADDR	0x02000000
> 
> void     enable_compat13(void);
> void     enable_compat20(void);

Flags:

dtucker: ok+

Actions: View | Diff

Attachments on bug 1012: 870 | 989