aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYang Tse <yangsita@gmail.com>2008-01-04 13:24:17 +0000
committerYang Tse <yangsita@gmail.com>2008-01-04 13:24:17 +0000
commitc479c643332b08eedcf9b7caa98b25e7f542d9c8 (patch)
treef0499b678a570e16b1c17b583832f2b4acebc0fb
parent7a2177dc42223ffa70fe10085e27944a7e07b1e3 (diff)
SunSSH 1.1 ssh client does not support config file options:
ConnectTimeout ForwardX11Trusted HashKnownHosts RekeyLimit ServerAliveCountMax ServerAliveInterval
-rw-r--r--tests/sshserver.pl10
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/sshserver.pl b/tests/sshserver.pl
index bec1d9f74..dac46a9f4 100644
--- a/tests/sshserver.pl
+++ b/tests/sshserver.pl
@@ -740,7 +740,7 @@ if(($sshid =~ /OpenSSH/) && ($sshvernum >= 370)) {
}
if((($sshid =~ /OpenSSH/) && ($sshvernum >= 370)) ||
- ($sshid =~ /SunSSH/)) {
+ (($sshid =~ /SunSSH/) && ($sshvernum >= 120))) {
push @cfgarr, 'ConnectTimeout 30';
}
@@ -758,12 +758,12 @@ if(($sshid =~ /OpenSSH/) && ($sshvernum >= 440)) {
}
if((($sshid =~ /OpenSSH/) && ($sshvernum >= 380)) ||
- ($sshid =~ /SunSSH/)) {
+ (($sshid =~ /SunSSH/) && ($sshvernum >= 120))) {
push @cfgarr, 'ForwardX11Trusted no';
}
if((($sshid =~ /OpenSSH/) && ($sshvernum >= 400)) ||
- ($sshid =~ /SunSSH/)) {
+ (($sshid =~ /SunSSH/) && ($sshvernum >= 120))) {
push @cfgarr, 'HashKnownHosts no';
}
@@ -786,7 +786,7 @@ if(($sshid =~ /OpenSSH/) && ($sshvernum >= 430)) {
}
if((($sshid =~ /OpenSSH/) && ($sshvernum >= 370)) ||
- ($sshid =~ /SunSSH/)) {
+ (($sshid =~ /SunSSH/) && ($sshvernum >= 120))) {
push @cfgarr, 'RekeyLimit 1G';
}
@@ -795,7 +795,7 @@ if(($sshid =~ /OpenSSH/) && ($sshvernum >= 390)) {
}
if((($sshid =~ /OpenSSH/) && ($sshvernum >= 380)) ||
- ($sshid =~ /SunSSH/)) {
+ (($sshid =~ /SunSSH/) && ($sshvernum >= 120))) {
push @cfgarr, 'ServerAliveCountMax 3';
push @cfgarr, 'ServerAliveInterval 0';
}