diff options
| -rwxr-xr-x | tests/runtests.pl | 3 | ||||
| -rw-r--r-- | tests/sshserver.pl | 12 |
2 files changed, 15 insertions, 0 deletions
diff --git a/tests/runtests.pl b/tests/runtests.pl index dfbb3c6d0..165fd0904 100755 --- a/tests/runtests.pl +++ b/tests/runtests.pl @@ -1116,6 +1116,9 @@ sub runsocksserver { # it is NOT alive logmsg "RUN: failed to start the SOCKS server\n"; # failed to talk to it properly. Kill the server and return failure + logmsg "=== Start of file log/ssh.log\n"; + displaylogcontent("log/ssh.log"); + logmsg "=== End of file log/ssh.log\n"; logmsg "TRACESSH:runsocksserver: calling stopserver with sshpid: $sshpid pid2: $pid2\n"; stopserver("$sshpid $pid2"); $doesntrun{$pidfile} = 1; diff --git a/tests/sshserver.pl b/tests/sshserver.pl index 049200941..103ab142a 100644 --- a/tests/sshserver.pl +++ b/tests/sshserver.pl @@ -13,6 +13,7 @@ use strict; use File::Spec; my $verbose=0; # set to 1 for debugging +my $showfiles=0; my $port = 8999; # just our default, weird enough my $listenaddr = "127.0.0.1"; # address on which to listen @@ -136,12 +137,18 @@ chomp($tmpstr = qx($sshd -V 2>&1 | grep OpenSSH)); if ($tmpstr =~ /OpenSSH[_-](\d+)\.(\d+)(\.(\d+))*/) { ($ssh_ver_major, $ssh_ver_minor, $ssh_ver_patch) = ($1, $2, $4); $ssh_daemon = 'OpenSSH'; + if(10 * $ssh_ver_major + $ssh_ver_minor == 36) { + $showfiles=1; + } } if(!$ssh_daemon) { chomp($tmpstr = qx($sshd -V 2>&1 | grep Sun_SSH)); if($tmpstr =~ /Sun[_-]SSH[_-](\d+)\.(\d+)/) { ($ssh_ver_major, $ssh_ver_minor) = ($1, $2); $ssh_daemon = 'SunSSH'; + if(10 * $ssh_ver_major + $ssh_ver_minor == 11) { + $showfiles=1; + } } } if ($verbose) { @@ -322,6 +329,11 @@ elsif ($verbose && ($cmdretval >> 8)) { printf("$sshd exited with %d \n", $cmdretval >> 8); } +if($showfiles) { + displayfile("log/sshd.log"); + displayfile("$conffile"); +} + unlink $conffile; exit $cmdretval >> 8; |