aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYang Tse <yangsita@gmail.com>2008-01-20 04:05:25 +0000
committerYang Tse <yangsita@gmail.com>2008-01-20 04:05:25 +0000
commite9490fdbd9b8c13fd924dcc46d04dbb72cc4f6ad (patch)
tree632fcd91e72f27758d128978cdab677234b19749
parentbd40b3ff3f95e8c30f58a6c69f79da8f6ca517f9 (diff)
Also disable GSSAPIAuthentication for the test harness ssh client
-rw-r--r--tests/sshserver.pl15
1 files changed, 13 insertions, 2 deletions
diff --git a/tests/sshserver.pl b/tests/sshserver.pl
index 88f3727fc..5f001fef4 100644
--- a/tests/sshserver.pl
+++ b/tests/sshserver.pl
@@ -507,8 +507,10 @@ if(sshd_supports_opt('SkeyAuthentication','no')) {
#***************************************************************************
# GSSAPI Authentication support may have not been built into sshd
#
+my $sshd_builtwith_GSSAPI;
if(sshd_supports_opt('GSSAPIAuthentication','no')) {
push @cfgarr, 'GSSAPIAuthentication no';
+ $sshd_builtwith_GSSAPI = 1;
}
if(sshd_supports_opt('GSSAPICleanupCredentials','yes')) {
push @cfgarr, 'GSSAPICleanupCredentials yes';
@@ -638,8 +640,8 @@ if(! -e $knownhosts) {
# ForwardX11Trusted : OpenSSH 3.8.0 and later
# GatewayPorts : OpenSSH 1.2.1 and later
# GlobalKnownHostsFile : OpenSSH 1.2.1 and later
-# GSSAPIAuthentication : OpenSSH 3.7.0 and later [1][3]
-# GSSAPIDelegateCredentials : OpenSSH 3.7.0 and later [1][3]
+# GSSAPIAuthentication : OpenSSH 3.7.0 and later [1]
+# GSSAPIDelegateCredentials : OpenSSH 3.7.0 and later [1]
# HashKnownHosts : OpenSSH 4.0.0 and later
# Host : OpenSSH 1.2.1 and later
# HostbasedAuthentication : OpenSSH 2.9.0 and later
@@ -767,6 +769,15 @@ if((($sshid =~ /OpenSSH/) && ($sshvernum >= 380)) ||
push @cfgarr, 'ForwardX11Trusted no';
}
+if(($sshd_builtwith_GSSAPI) && ($sshdid eq $sshid) &&
+ ($sshdvernum == $sshvernum)) {
+ push @cfgarr, 'GSSAPIAuthentication no';
+ push @cfgarr, 'GSSAPIDelegateCredentials no';
+ if($sshid =~ /SunSSH/) {
+ push @cfgarr, 'GSSAPIKeyExchange no';
+ }
+}
+
if((($sshid =~ /OpenSSH/) && ($sshvernum >= 400)) ||
(($sshid =~ /SunSSH/) && ($sshvernum >= 120))) {
push @cfgarr, 'HashKnownHosts no';