openssh unix dev - Apr 2003 - OpenSSH 3.6.1p1 "Proxy-None" patch

Hi OpenSSH'lers!

While using OpenSSH for quite a while, I became annoyed with the
inflexible config-file parsing algorithm. I special it did not
alow me to express: "Use *no* proxy for host xyz, but *this* proxy
for all other hosts". 

So I had a look at the source an make a quick-n-dirty change, allowing
me to use the special ProxyCommand "None" to express "don't
use a proxy".

Today I had to rework the patch, because the current version of the 
config-file lexer/parser leaves no space in from of the keyword anymore
(gooood), but keeps a trailinh carriage-return (bad).

Anyway, the patch is attached. Hopefully it's usefull not only to me.
Usage is this way:

Host internal-machine
	ProxyCommand None

Host *
	ProxyCommand <any-proxy-command>

Best regard
Olaf
-- 
Olaf P?schel, Softwaretechnik, OLMOS Workstations GmbH, Germany
Wolfenb?tteler Str. 31A, 38102 Braunschweig, Fon.: +49-531-22020-0 Fax: -99
OLMOS supports signed and/or encrypted mail. Grab my key at www.keyserver..net
"Unix *is* user friendly. It's just a bit picky about its friends"
-------------- next part --------------
*** sshconnect.c	Mon Dec 23 03:06:20 2002
--- sshconnect.c.patch	Mon Apr 14 14:52:20 2003
***************
*** 47,52 ****
--- 47,56 ----
  #define INET6_ADDRSTRLEN 46
  #endif
  
+ #ifndef PROXY_NONE
+ #define PROXY_NONE "None\n"
+ #endif
+ 
  static int show_other_keys(const char *, Key *);
  
  /*
***************
*** 258,264 ****
  			port = SSH_DEFAULT_PORT;
  	}
  	/* If a proxy command is given, connect using it. */
! 	if (proxy_command != NULL)
  		return ssh_proxy_connect(host, port, proxy_command);
  
  	/* No proxy command. */
--- 262,268 ----
  			port = SSH_DEFAULT_PORT;
  	}
  	/* If a proxy command is given, connect using it. */
! 	if (proxy_command != NULL && strcmp(proxy_command, PROXY_NONE))
  		return ssh_proxy_connect(host, port, proxy_command);
  
  	/* No proxy command. */

On Mon, Apr 14, 2003 at 03:11:40PM +0200, Olaf P?schel
wrote:
> While using OpenSSH for quite a while, I became annoyed with the
> inflexible config-file parsing algorithm. I special it did not
> alow me to express: "Use *no* proxy for host xyz, but *this* proxy
> for all other hosts". 
3.6.1 already supports 'none' but it's broken.

this patch against 3.6.1 should make
	ProxyCommand none
work:

Index: readconf.c
==================================================================RCS file:
/cvs/src/usr.bin/ssh/readconf.c,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -IOpenBSD -r1.105 -r1.106
--- readconf.c	2 Apr 2003 09:48:07 -0000	1.105
+++ readconf.c	9 Apr 2003 12:00:37 -0000	1.106
@@ -279,6 +279,13 @@
 	size_t len;
 	u_short fwd_port, fwd_host_port;
 	char sfwd_host_port[6];
+
+	/* Strip trailing whitespace */
+	for(len = strlen(line) - 1; len > 0; len--) {
+		if (strchr(WHITESPACE, line[len]) == NULL)
+			break;
+		line[len] = '\0';
+	}
 
 	s = line;
 	/* Get the keyword. (Each line is supposed to begin with a keyword). */