summaryrefslogtreecommitdiff
path: root/tests/sshserver.pl
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2019-04-08 19:43:48 +0200
committerDaniel Stenberg <daniel@haxx.se>2019-04-13 11:21:53 +0200
commit54c784556e3579c24de9cc79e435e8bbaa4f6c81 (patch)
tree0752dd8c8013bdfb7c2d03a1bb52e3b27811b14a /tests/sshserver.pl
parent04fd67555cc2bd76844de61967f102d388ab254c (diff)
downloadcurl-54c784556e3579c24de9cc79e435e8bbaa4f6c81.tar.gz
test: make tests and test scripts use socksd for SOCKS
Make all SOCKS tests use socksd instead of ssh.
Diffstat (limited to 'tests/sshserver.pl')
-rwxr-xr-xtests/sshserver.pl25
1 files changed, 7 insertions, 18 deletions
diff --git a/tests/sshserver.pl b/tests/sshserver.pl
index 9b3d122fd..428535ece 100755
--- a/tests/sshserver.pl
+++ b/tests/sshserver.pl
@@ -6,7 +6,7 @@
# | (__| |_| | _ <| |___
# \___|\___/|_| \_\_____|
#
-# Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al.
+# Copyright (C) 1998 - 2019, Daniel Stenberg, <daniel@haxx.se>, et al.
#
# This software is licensed as described in the file COPYING, which
# you should have received as part of this distribution. The terms
@@ -21,7 +21,7 @@
#
#***************************************************************************
-# Starts sshd for use in the SCP, SFTP and SOCKS curl test harness tests.
+# Starts sshd for use in the SCP and SFTP curl test harness tests.
# Also creates the ssh configuration files needed for these tests.
use strict;
@@ -81,7 +81,6 @@ use pathhelp;
my $verbose = 0; # set to 1 for debugging
my $debugprotocol = 0; # set to 1 for protocol debugging
my $port = 8999; # our default SCP/SFTP server port
-my $socksport = $port + 1; # our default SOCKS4/5 server port
my $listenaddr = '127.0.0.1'; # default address on which to listen
my $ipvnum = 4; # default IP version of listener address
my $idnum = 1; # default ssh daemon instance number
@@ -157,14 +156,6 @@ while(@ARGV) {
}
}
}
- elsif($ARGV[0] eq '--socksport') {
- if($ARGV[1]) {
- if($ARGV[1] =~ /^(\d+)$/) {
- $socksport = $1;
- shift @ARGV;
- }
- }
- }
else {
print STDERR "\nWarning: sshserver.pl unknown parameter: $ARGV[0]\n";
}
@@ -181,11 +172,10 @@ if(!$pidfile) {
#***************************************************************************
-# ssh, socks and sftp server log file names
+# ssh and sftp server log file names
#
$sshdlog = server_logfilename($logdir, 'ssh', $ipvnum, $idnum);
$sftplog = server_logfilename($logdir, 'sftp', $ipvnum, $idnum);
-$sshlog = server_logfilename($logdir, 'socks', $ipvnum, $idnum);
#***************************************************************************
@@ -226,7 +216,7 @@ my ($sshdid, $sshdvernum, $sshdverstr, $sshderror) = sshversioninfo($sshd);
if(!$sshdid) {
# Not an OpenSSH or SunSSH ssh daemon
logmsg $sshderror if($verbose);
- logmsg 'SCP, SFTP and SOCKS tests require OpenSSH 2.9.9 or later';
+ logmsg 'SCP and SFTP tests require OpenSSH 2.9.9 or later';
exit 1;
}
logmsg "ssh server found $sshd is $sshdverstr" if($verbose);
@@ -255,7 +245,7 @@ logmsg "ssh server found $sshd is $sshdverstr" if($verbose);
#
if((($sshdid =~ /OpenSSH/) && ($sshdvernum < 299)) ||
(($sshdid =~ /SunSSH/) && ($sshdvernum < 100))) {
- logmsg 'SCP, SFTP and SOCKS tests require OpenSSH 2.9.9 or later';
+ logmsg 'SCP and SFTP tests require OpenSSH 2.9.9 or later';
exit 1;
}
@@ -310,7 +300,7 @@ my ($sshid, $sshvernum, $sshverstr, $ssherror) = sshversioninfo($ssh);
if(!$sshid) {
# Not an OpenSSH or SunSSH ssh client
logmsg $ssherror if($verbose);
- logmsg 'SCP, SFTP and SOCKS tests require OpenSSH 2.9.9 or later';
+ logmsg 'SCP and SFTP tests require OpenSSH 2.9.9 or later';
exit 1;
}
logmsg "ssh client found $ssh is $sshverstr" if($verbose);
@@ -341,7 +331,7 @@ logmsg "ssh client found $ssh is $sshverstr" if($verbose);
#
if((($sshid =~ /OpenSSH/) && ($sshvernum < 299)) ||
(($sshid =~ /SunSSH/) && ($sshvernum < 100))) {
- logmsg 'SCP, SFTP and SOCKS tests require OpenSSH 2.9.9 or later';
+ logmsg 'SCP and SFTP tests require OpenSSH 2.9.9 or later';
exit 1;
}
@@ -864,7 +854,6 @@ push @cfgarr, "User $username";
push @cfgarr, 'Protocol 2';
push @cfgarr, '#';
push @cfgarr, "BindAddress $listenaddr";
-push @cfgarr, "DynamicForward $socksport";
push @cfgarr, '#';
push @cfgarr, "IdentityFile $identity_config";
push @cfgarr, "UserKnownHostsFile $knownhosts_config";