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

pass srcdir to the ftps-server as well

Browse Source
This commit is contained in:
Daniel Stenberg
2003-01-21 10:29:06 +00:00
parent 5796a1b282
commit 126e6d6645
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
tests/ftpsserver.pl
View File

@@ -25,6 +25,12 @@ my $verbose=0; # set to 1 for debugging
my $port = 8821; # just our default, weird enough my $port = 8821; # just our default, weird enough
my $remote_port = 8921; # test ftp-server port my $remote_port = 8921; # test ftp-server port
my $path = `pwd`;
chomp $path;
my $srcdir=$path;
do { do {
if($ARGV[0] eq "-v") { if($ARGV[0] eq "-v") {
$verbose=1; $verbose=1;
@@ -33,16 +39,17 @@ do {
$remote_port=$ARGV[1]; $remote_port=$ARGV[1];
shift @ARGV; shift @ARGV;
} }
elsif($ARGV[0] eq "-d") {
$srcdir=$ARGV[1];
shift @ARGV;
}
elsif($ARGV[0] =~ /^(\d+)$/) { elsif($ARGV[0] =~ /^(\d+)$/) {
$port = $1; $port = $1;
} }
} while(shift @ARGV); } while(shift @ARGV);
my $path = `pwd`;
chomp $path;
my $conffile="$path/stunnel.conf"; # stunnel configuration data my $conffile="$path/stunnel.conf"; # stunnel configuration data
my $certfile="$path/stunnel.pem"; # stunnel server certificate my $certfile="$srcdir/stunnel.pem"; # stunnel server certificate
my $pidfile="$path/.ftps.pid"; # stunnel process pid file my $pidfile="$path/.ftps.pid"; # stunnel process pid file
open(CONF, ">$conffile") || return 1; open(CONF, ">$conffile") || return 1;
@@ -60,7 +67,7 @@ print CONF "
connect = $remote_port connect = $remote_port
"; ";
close CONF; close CONF;
system("chmod go-rwx $conffile $path/stunnel.pem"); # secure permissions #system("chmod go-rwx $conffile $certfile"); # secure permissions
# works only with stunnel versions < 4.00 # works only with stunnel versions < 4.00
my $cmd="$stunnel -p $certfile -P $pidfile -d $port -r $remote_port 2>/dev/null"; my $cmd="$stunnel -p $certfile -P $pidfile -d $port -r $remote_port 2>/dev/null";

2
tests/runtests.pl
View File

@@ -296,7 +296,7 @@ sub runftpsserver {
} }
my $flag=$debugprotocol?"-v ":""; my $flag=$debugprotocol?"-v ":"";
my $cmd="$perl $srcdir/ftpsserver.pl $flag -r $FTPPORT $FTPSPORT &"; my $cmd="$perl $srcdir/ftpsserver.pl $flag -d $srcdir -r $FTPPORT $FTPSPORT &";
system($cmd); system($cmd);
if($verbose) { if($verbose) {
print "CMD: $cmd\n"; print "CMD: $cmd\n";