generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add /opt/ssh/sbin and /opt/ssh/libexec to the sshd locations search list.

Browse Source 
Improve wording of a couple of debug messages.
This commit is contained in:
Yang Tse 2007-11-18 01:16:44 +00:00
parent c4e5613a7d
commit 536f98a766
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/sshserver.pl
View File

@ -42,6 +42,8 @@ my @sftppath = qw(
/usr/lib/misc /usr/lib/misc
/usr/local/sbin /usr/local/sbin
/usr/freeware/bin /usr/freeware/bin
/opt/ssh/sbin
/opt/ssh/libexec
); );
my $username = $ENV{USER}; my $username = $ENV{USER};
@ -131,14 +133,13 @@ if ($verbose) {
# Verify minimum OpenSSH version. # Verify minimum OpenSSH version.
if (($ssh_daemon !~ /OpenSSH/) || (10 * $ssh_ver_major + $ssh_ver_minor < 37)) { if (($ssh_daemon !~ /OpenSSH/) || (10 * $ssh_ver_major + $ssh_ver_minor < 37)) {
my $info;
if(!$ssh_daemon) { if(!$ssh_daemon) {
$info = "OpenSSH not found"; print "SSH server daemon found is not an OpenSSH daemon\n";
} }
else { 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; exit 1;
} }