'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 dac46a9f423ba0dc4f143483b82865b9cdb4f095..f651e0714df62b61b30c9f83516e45c2ac9f5d96 100644 (file)
--- 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';
 }