'ControlPath none'

[David Woodhouse]

With the last three patches I can now do something like this...

 Host *
    ControlPath ~/.ssh/sockets/%h-%p-%u
    ControlMaster autopersist

If I want to be able to turn that _off_ for specific hosts, I'll want
this patch so that I can override the ControlPath setting....

--- openssh-4.1p1/ssh.c~	2005-06-12 13:55:32.000000000 +0100
+++ openssh-4.1p1/ssh.c	2005-06-12 15:14:43.000000000 +0100
@@ -619,6 +619,10 @@ again:
 	    strcmp(options.proxy_command, "none") == 0)
 		options.proxy_command = NULL;
 
+	if (options.control_path != NULL &&
+	    strcmp(options.control_path, "none") == 0)
+		options.control_path = NULL;
+
 	if (options.control_path != NULL) {
 		options.control_path = tilde_expand_filename(
 		   options.control_path, original_real_uid);

-- 
dwmw2