diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ssh.c | 5 | ||||
-rw-r--r-- | ssh_config.5 | 6 |
3 files changed, 12 insertions, 4 deletions
@@ -4,6 +4,9 @@ | |||
4 | [ssh.c sshconnect.c] | 4 | [ssh.c sshconnect.c] |
5 | Fix ControlPath's %p expanding to "0" for a default port, | 5 | Fix ControlPath's %p expanding to "0" for a default port, |
6 | spotted dwmw2 AT infradead.org; ok markus@ | 6 | spotted dwmw2 AT infradead.org; ok markus@ |
7 | - djm@cvs.openbsd.org 2005/06/18 04:30:36 | ||
8 | [ssh.c ssh_config.5] | ||
9 | allow ControlPath=none, patch from dwmw2 AT infradead.org; ok dtucker@ | ||
7 | 10 | ||
8 | 20050618 | 11 | 20050618 |
9 | - (djm) OpenBSD CVS Sync | 12 | - (djm) OpenBSD CVS Sync |
@@ -2756,4 +2759,4 @@ | |||
2756 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 2759 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
2757 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 2760 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
2758 | 2761 | ||
2759 | $Id: ChangeLog,v 1.3828 2005/06/25 22:55:25 djm Exp $ | 2762 | $Id: ChangeLog,v 1.3829 2005/06/25 22:56:03 djm Exp $ |
@@ -40,7 +40,7 @@ | |||
40 | */ | 40 | */ |
41 | 41 | ||
42 | #include "includes.h" | 42 | #include "includes.h" |
43 | RCSID("$OpenBSD: ssh.c,v 1.244 2005/06/17 22:53:46 djm Exp $"); | 43 | RCSID("$OpenBSD: ssh.c,v 1.245 2005/06/18 04:30:36 djm Exp $"); |
44 | 44 | ||
45 | #include <openssl/evp.h> | 45 | #include <openssl/evp.h> |
46 | #include <openssl/err.h> | 46 | #include <openssl/err.h> |
@@ -610,6 +610,9 @@ again: | |||
610 | if (options.proxy_command != NULL && | 610 | if (options.proxy_command != NULL && |
611 | strcmp(options.proxy_command, "none") == 0) | 611 | strcmp(options.proxy_command, "none") == 0) |
612 | options.proxy_command = NULL; | 612 | options.proxy_command = NULL; |
613 | if (options.control_path != NULL && | ||
614 | strcmp(options.control_path, "none") == 0) | ||
615 | options.control_path = NULL; | ||
613 | 616 | ||
614 | if (options.control_path != NULL) { | 617 | if (options.control_path != NULL) { |
615 | snprintf(buf, sizeof(buf), "%d", options.port); | 618 | snprintf(buf, sizeof(buf), "%d", options.port); |
diff --git a/ssh_config.5 b/ssh_config.5 index a04ffc288..3e7ca8f28 100644 --- a/ssh_config.5 +++ b/ssh_config.5 | |||
@@ -34,7 +34,7 @@ | |||
34 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 34 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
35 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 35 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
36 | .\" | 36 | .\" |
37 | .\" $OpenBSD: ssh_config.5,v 1.56 2005/06/08 11:25:09 djm Exp $ | 37 | .\" $OpenBSD: ssh_config.5,v 1.57 2005/06/18 04:30:36 djm Exp $ |
38 | .Dd September 25, 1999 | 38 | .Dd September 25, 1999 |
39 | .Dt SSH_CONFIG 5 | 39 | .Dt SSH_CONFIG 5 |
40 | .Os | 40 | .Os |
@@ -293,7 +293,9 @@ option. | |||
293 | Specify the path to the control socket used for connection sharing as described | 293 | Specify the path to the control socket used for connection sharing as described |
294 | in the | 294 | in the |
295 | .Cm ControlMaster | 295 | .Cm ControlMaster |
296 | section above. | 296 | section above or the string |
297 | .Dq none | ||
298 | to disable connection sharing. | ||
297 | In the path, | 299 | In the path, |
298 | .Ql %h | 300 | .Ql %h |
299 | will be substituted by the target host name, | 301 | will be substituted by the target host name, |