From: Yang Tse <yangsita@gmail.com>
Date: Fri, 4 Jan 2008 14:12:10 +0000 (+0000)
Subject: 'ControlPath' ssh client configuration file option requires OpenSSH 4.2 or
X-Git-Tag: upstream/7.37.1~8263
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=61a2d5ea75706520ccafd48aa7d4c6d35f92204e;p=platform%2Fupstream%2Fcurl.git

'ControlPath' ssh client configuration file option requires OpenSSH 4.2 or
later to accept 'none' as an indication to disable connection multiplexing
---

diff --git a/tests/sshserver.pl b/tests/sshserver.pl
index dac46a9..f651e07 100644
--- a/tests/sshserver.pl
+++ b/tests/sshserver.pl
@@ -746,6 +746,9 @@ if((($sshid =~ /OpenSSH/) && ($sshvernum >= 370)) ||
 
 if(($sshid =~ /OpenSSH/) && ($sshvernum >= 390)) {
     push @cfgarr, 'ControlMaster no';
+}
+
+if(($sshid =~ /OpenSSH/) && ($sshvernum >= 420)) {
     push @cfgarr, 'ControlPath none';
 }