diff options
| author | Damien Miller <djm@cvs.openbsd.org> | 2005-06-18 04:30:37 +0000 |
|---|---|---|
| committer | Damien Miller <djm@cvs.openbsd.org> | 2005-06-18 04:30:37 +0000 |
| commit | 9cda040913008ed18b4c04d58416e49cadeecd82 (patch) | |
| tree | 69c679f7933b6c1e78ec3ac28817e70b86b8b187 | |
| parent | de46c7b9675b0262ffde0f902ae73ccf2b631639 (diff) | |
allow ControlPath=none, patch from dwmw2 AT infradead.org; ok dtucker@
| -rw-r--r-- | usr.bin/ssh/ssh.c | 5 | ||||
| -rw-r--r-- | usr.bin/ssh/ssh_config.5 | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/usr.bin/ssh/ssh.c b/usr.bin/ssh/ssh.c index 813406f8e71..3e4741c6aab 100644 --- a/usr.bin/ssh/ssh.c +++ b/usr.bin/ssh/ssh.c @@ -40,7 +40,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: ssh.c,v 1.244 2005/06/17 22:53:46 djm Exp $"); +RCSID("$OpenBSD: ssh.c,v 1.245 2005/06/18 04:30:36 djm Exp $"); #include <openssl/evp.h> #include <openssl/err.h> @@ -603,6 +603,9 @@ again: if (options.proxy_command != NULL && 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) { snprintf(buf, sizeof(buf), "%d", options.port); diff --git a/usr.bin/ssh/ssh_config.5 b/usr.bin/ssh/ssh_config.5 index a04ffc288f0..3e7ca8f2822 100644 --- a/usr.bin/ssh/ssh_config.5 +++ b/usr.bin/ssh/ssh_config.5 @@ -34,7 +34,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $OpenBSD: ssh_config.5,v 1.56 2005/06/08 11:25:09 djm Exp $ +.\" $OpenBSD: ssh_config.5,v 1.57 2005/06/18 04:30:36 djm Exp $ .Dd September 25, 1999 .Dt SSH_CONFIG 5 .Os @@ -293,7 +293,9 @@ option. Specify the path to the control socket used for connection sharing as described in the .Cm ControlMaster -section above. +section above or the string +.Dq none +to disable connection sharing. In the path, .Ql %h will be substituted by the target host name, |