Revert last change since it breaks running the test suite
when builddir is different from srcdir.
This commit is contained in:
@@ -163,7 +163,7 @@ sub sysread_or_die {
|
||||
}
|
||||
|
||||
sub startsf {
|
||||
my $cmd="$srcdir/server/sockfilt --port $port --logfile log/sockctrl$ftpdnum$ext.log --pidfile .sockfilt$ftpdnum$ext.pid $ipv6";
|
||||
my $cmd="./server/sockfilt --port $port --logfile log/sockctrl$ftpdnum$ext.log --pidfile .sockfilt$ftpdnum$ext.pid $ipv6";
|
||||
$sfpid = open2(*SFREAD, *SFWRITE, $cmd);
|
||||
|
||||
print STDERR "$cmd\n" if($verbose);
|
||||
@@ -548,7 +548,7 @@ sub PASV_command {
|
||||
|
||||
# We fire up a new sockfilt to do the data transfer for us.
|
||||
$slavepid = open2(\*DREAD, \*DWRITE,
|
||||
"$srcdir/server/sockfilt --port 0 --logfile log/sockdata$ftpdnum$ext.log --pidfile $pidf $ipv6");
|
||||
"./server/sockfilt --port 0 --logfile log/sockdata$ftpdnum$ext.log --pidfile $pidf $ipv6");
|
||||
|
||||
print DWRITE "PING\n";
|
||||
my $pong;
|
||||
@@ -680,7 +680,7 @@ sub PORT_command {
|
||||
|
||||
# We fire up a new sockfilt to do the data transfer for us.
|
||||
# FIX: make it use IPv6 if need be
|
||||
my $filtcmd="$srcdir/server/sockfilt --connect $port --addr $addr --logfile log/sockdata$ftpdnum$ext.log --pidfile .sockdata$ftpdnum$ext.pid $ipv6";
|
||||
my $filtcmd="./server/sockfilt --connect $port --addr $addr --logfile log/sockdata$ftpdnum$ext.log --pidfile .sockdata$ftpdnum$ext.pid $ipv6";
|
||||
$slavepid = open2(\*DREAD, \*DWRITE, $filtcmd);
|
||||
|
||||
print STDERR "$filtcmd\n" if($verbose);
|
||||
|
||||
Reference in New Issue
Block a user