SOURCES: pure-ftpd-sleep.patch - correct version

[arekm]

Author: arekm                        Date: Thu Dec 20 09:09:52 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- correct version

---- Files affected:
SOURCES:
   pure-ftpd-sleep.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/pure-ftpd-sleep.patch
diff -u SOURCES/pure-ftpd-sleep.patch:1.1 SOURCES/pure-ftpd-sleep.patch:1.2
--- SOURCES/pure-ftpd-sleep.patch:1.1	Thu Dec 20 09:45:00 2007
+++ SOURCES/pure-ftpd-sleep.patch	Thu Dec 20 10:09:47 2007
@@ -1,6 +1,6 @@
---- pure-ftpd/src/ftpd.c.org	2007-12-20 09:23:58.180941494 +0100
-+++ pure-ftpd/src/ftpd.c	2007-12-20 09:34:06.613793269 +0100
-@@ -1532,6 +1532,11 @@
+--- pure-ftpd/src/ftpd.c.orig	2007-12-20 09:59:10.629736723 +0100
++++ pure-ftpd/src/ftpd.c	2007-12-20 10:02:06.655676098 +0100
+@@ -1531,6 +1531,11 @@
      return chdir(home);
  }
  
@@ -12,7 +12,7 @@
  void dopass(char *password)
  {
      static unsigned int tapping;    
-@@ -1572,27 +1577,26 @@
+@@ -1571,27 +1576,28 @@
          }
      }
      if (authresult.auth_ok != 1) {
@@ -40,18 +40,18 @@
      }
      if (authresult.uid < useruid) {
          logfile(LOG_WARNING, MSG_ACCOUNT_DISABLED, account);
--        if (tapping >= MAX_PASSWD_TRIES) {
++	randomsleep(tapping);
+         if (tapping >= MAX_PASSWD_TRIES) {
 -            goto toomanytries;
--        }
++	    addreply_noformat(530, MSG_AUTH_FAILED);
++	    doreply();
++	    _EXIT(EXIT_FAILURE);
+         }
 -        addreply_noformat(530, MSG_NOTRUST);
 -        goto randomsleep;
-+	randomsleep(tapping);
-+        if (tapping >= MAX_PASSWD_TRIES)
-+	    addreply_noformat(530, MSG_AUTH_FAILED);
-+	else
-+	    addreply_noformat(530, MSG_NOTRUST);
++	addreply_noformat(530, MSG_NOTRUST);
 +	doreply();
-+	_EXIT(EXIT_FAILURE);
++	return;
      }
  
  #ifdef PER_USER_LIMITS
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/pure-ftpd-sleep.patch?r1=1.1&r2=1.2&f=u