[ssh.c sshconnect.c]
Fix ControlPath's %p expanding to "0" for a default port,
spotted dwmw2 AT infradead.org; ok markus@
+ - djm@cvs.openbsd.org 2005/06/18 04:30:36
+ [ssh.c ssh_config.5]
+ allow ControlPath=none, patch from dwmw2 AT infradead.org; ok dtucker@
20050618
- (djm) OpenBSD CVS Sync
*/
#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>
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);
.\" (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
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,