aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorYang Tse <yangsita@gmail.com>2007-11-18 01:16:44 +0000
committerYang Tse <yangsita@gmail.com>2007-11-18 01:16:44 +0000
commit536f98a766143cf8c3222642cb5c00b4f994701a (patch)
tree645bbc7d338e4266fae1f5d0dc5253a99a73688e /tests
parentc4e5613a7d431ca547d9e5d63dbafe51e66c1613 (diff)
Add /opt/ssh/sbin and /opt/ssh/libexec to the sshd locations search list.
Improve wording of a couple of debug messages.
Diffstat (limited to 'tests')
-rw-r--r--tests/sshserver.pl9
1 files changed, 5 insertions, 4 deletions
diff --git a/tests/sshserver.pl b/tests/sshserver.pl
index d5b49afe4..79fcd995b 100644
--- a/tests/sshserver.pl
+++ b/tests/sshserver.pl
@@ -42,6 +42,8 @@ my @sftppath = qw(
/usr/lib/misc
/usr/local/sbin
/usr/freeware/bin
+ /opt/ssh/sbin
+ /opt/ssh/libexec
);
my $username = $ENV{USER};
@@ -131,14 +133,13 @@ if ($verbose) {
# Verify minimum OpenSSH version.
if (($ssh_daemon !~ /OpenSSH/) || (10 * $ssh_ver_major + $ssh_ver_minor < 37)) {
- my $info;
if(!$ssh_daemon) {
- $info = "OpenSSH not found";
+ print "SSH server daemon found is not an OpenSSH daemon\n";
}
else {
- $info = "Found OpenSSH $ssh_ver_major.$ssh_ver_minor"
+ print "SSH server daemon found is OpenSSH $ssh_ver_major.$ssh_ver_minor\n";
}
- print "$info: SCP, SFTP and SOCKS tests require OpenSSH 3.7 or later\n";
+ print "SCP, SFTP and SOCKS tests require OpenSSH 3.7 or later\n";
exit 1;
}