From 61a2d5ea75706520ccafd48aa7d4c6d35f92204e Mon Sep 17 00:00:00 2001
From: Yang Tse <yangsita@gmail.com>
Date: Fri, 4 Jan 2008 14:12:10 +0000
Subject: 'ControlPath' ssh client configuration file option requires OpenSSH
 4.2 or later to accept 'none' as an indication to disable connection
 multiplexing

---
 tests/sshserver.pl | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'tests/sshserver.pl')

diff --git a/tests/sshserver.pl b/tests/sshserver.pl
index dac46a9f4..f651e0714 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';
 }
 
-- 
cgit v1.2.3