From 268fe09322258ae4af4581063111edf4a1597881 Mon Sep 17 00:00:00 2001
From: Yang Tse <yangsita@gmail.com>
Date: Mon, 20 Nov 2006 16:58:41 +0000
Subject: 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

---
 tests/ftpserver.pl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'tests')

diff --git a/tests/ftpserver.pl b/tests/ftpserver.pl
index 566453a3f..b22ebdfc5 100644
--- 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);
-- 
cgit v1.2.3