This is a temporary change to test if OpenSSH 3.6 and SunSSH 1.1
are good/compatible enough to run the test suite ssh server and socks tests
This commit is contained in:
@@ -2380,12 +2380,18 @@ sub startservers {
|
||||
}
|
||||
if(!$run{'socks'}) {
|
||||
my $sshversion=`ssh -V 2>&1`;
|
||||
if ($sshversion =~ /SSH_(\d+)\.(\d+)/i) {
|
||||
if ($1*10+$2 < 37) {
|
||||
# need 3.7 for socks5 - http://www.openssh.com/txt/release-3.7
|
||||
return "ssh version ($1.$2) insufficient; need at least 3.7";
|
||||
}
|
||||
} else {
|
||||
if($sshversion =~ /OpenSSH[_-](\d+)\.(\d+)/i) {
|
||||
if ($1*10+$2 < 36) {
|
||||
# need 3.7 for socks5 - http://www.openssh.com/txt/release-3.7
|
||||
return "OpenSSH version ($1.$2) insufficient; need at least 3.7";
|
||||
}
|
||||
}
|
||||
elsif($sshversion =~ /Sun[_-]SSH[_-](\d+)\.(\d+)/i) {
|
||||
if ($1*10+$2 < 11) {
|
||||
return "SunSSH version ($1.$2) insufficient; need at least 1.1";
|
||||
}
|
||||
}
|
||||
else {
|
||||
return "Unsupported ssh client\n";
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user