Revert change committed on Mon May 4 09:30:23 2009 UTC.

The origin of the problem with test case #251 was the --ftp-port not being the CLIENTIP address.
This commit is contained in:
Yang Tse
2009-05-05 08:46:31 +00:00
parent b40b989523
commit a840cc700a
2 changed files with 20 additions and 30 deletions

View File

@@ -943,8 +943,6 @@ sub runftpserver {
my $ip=$HOSTIP;
my $nameext;
my $cmd;
my $addr;
my $addr_client;
if($ipv6) {
# if IPv6, use a different setup
@@ -968,20 +966,18 @@ sub runftpserver {
# start our server:
my $flag=$debugprotocol?"-v ":"";
$flag .= "-s \"$srcdir\" ";
my $addr;
if($id) {
$flag .="--id $id ";
}
if($ipv6) {
$flag .="--ipv6 ";
$addr = $HOST6IP;
$addr_client = $CLIENT6IP;
} else {
$addr = $HOSTIP;
$addr_client = $CLIENTIP;
}
$cmd="$perl $srcdir/ftpserver.pl --pidfile $pidfile $flag --port $port --addr \"$addr\" --client \"$addr_client\"";
$cmd="$perl $srcdir/ftpserver.pl --pidfile $pidfile $flag --port $port --addr \"$addr\"";
my ($ftppid, $pid2) = startnew($cmd, $pidfile, 15, 0);
if($ftppid <= 0 || !kill(0, $ftppid)) {