openssh unix dev - Aug 2003 - [PATCH] Minor nit: -D is now "socks" not "socks4"

Hi all.
	I was getting something working over socks5 and was trying to figure out
why it kept using socks4.  It wasn't, it was just a misleading debug
message....

	Patch applies to either OpenBSD or Portable.

-- 
Darren Tucker (dtucker at zip.com.au)
GPG key 8FF4FA69 / D9A3 86E9 7EEE AF4B B2D4  37C9 C982 80C7 8FF4 FA69
    Good judgement comes with experience. Unfortunately, the experience
usually comes from bad judgement.
-------------- next part --------------
Index: readconf.c
==================================================================RCS file:
/usr/local/src/security/openssh/cvs/openssh_cvs/readconf.c,v
retrieving revision 1.90
diff -u -p -r1.90 readconf.c
--- readconf.c	2 Aug 2003 12:24:49 -0000	1.90
+++ readconf.c	12 Aug 2003 07:21:16 -0000
@@ -676,7 +676,7 @@ parse_int:
 			fatal("%.200s line %d: Badly formatted port number.",
 			    filename, linenum);
 		if (*activep)
-			add_local_forward(options, fwd_port, "socks4", 0);
+			add_local_forward(options, fwd_port, "socks", 0);
 		break;
 
 	case oClearAllForwardings:
Index: ssh.c
==================================================================RCS file:
/usr/local/src/security/openssh/cvs/openssh_cvs/ssh.c,v
retrieving revision 1.177
diff -u -p -r1.177 ssh.c
--- ssh.c	2 Aug 2003 12:24:50 -0000	1.177
+++ ssh.c	12 Aug 2003 07:20:54 -0000
@@ -445,7 +445,7 @@ again:
 				    optarg);
 				exit(1);
 			}
-			add_local_forward(&options, fwd_port, "socks4", 0);
+			add_local_forward(&options, fwd_port, "socks", 0);
 			break;
 
 		case 'C':

Darren Tucker wrote:
>Hi all.
>	I was getting something working over socks5 and was trying to figure out
>why it kept using socks4.  It wasn't, it was just a misleading debug
>message....
>
>	Patch applies to either OpenBSD or Portable.
>  
>
We should be able to trivially support both SOCKS4 and SOCKS5, based on 
the value in the version field of the incoming request.

It's important to support both, since there's alot of systems that only 
support 4 or 5.

There's an interesting argument that we should have, as a long option, a 
mode that rejects all forwards of the non-DNS forwarding type, for those 
who intend to use the code for VPN-style uses.   This obviously 
restricts the system to a subset of SOCKS5.

--Dan