Revert ftpserver.pl back to revision 1.74 Adding change done in 1.76

This is done to back out changes done in revisions 1.77 and 1.75

diff --git a/tests/ftpserver.pl b/tests/ftpserver.pl
index 566453a3f15954584a7b8ce340196286b566a1c5..b22ebdfc57c4e09fe06d8a261eaa1962ca1eeefc 100644 (file)
--- a/tests/ftpserver.pl
+++ b/tests/ftpserver.pl
@@ -114,7 +114,7 @@ do {
 sub catch_zap {
     my $signame = shift;
     print STDERR "ftpserver.pl received SIG$signame, exiting\n";
-    ftpkillslave($ftpdnum, $ext, 1);
+    ftpkillslaves(1);
     die "Somebody sent me a SIG$signame";
 }
 $SIG{INT} = \&catch_zap;
@@ -523,7 +523,7 @@ sub PASV_command {
     my $pasvport;
     my $pidf=".sockdata$ftpdnum$ext.pid";
 
-    my $prev = checkalivepidfile($pidf);
+    my $prev = checkserver($pidf);
     if($prev > 0) {
         print "kill existing server: $prev\n" if($verbose);
         kill(9, $prev);