[Pkg-shadow-commits] r2376 - in debian/trunk/debian: . patches

[nekral-guest at alioth.debian.org]

Author: nekral-guest
Date: 2008-09-13 17:06:57 +0000 (Sat, 13 Sep 2008)
New Revision: 2376

Modified:
   debian/trunk/debian/changelog
   debian/trunk/debian/patches/463_login_delay_obeys_to_PAM
Log:
Updated for upstream version 4.1.2.


Modified: debian/trunk/debian/changelog
===================================================================
--- debian/trunk/debian/changelog	2008-09-13 17:04:57 UTC (rev 2375)
+++ debian/trunk/debian/changelog	2008-09-13 17:06:57 UTC (rev 2376)
@@ -4,6 +4,7 @@
   * New upstream release:
     - Updated patches:
       + debian/patches/431_su_uid_0_not_root
+      + debian/patches/463_login_delay_obeys_to_PAM
   * debian/control: changed the "Replaces" on manpages-zh to a versioned
     one on 1.5.1-1
   * debian/control: drop all Replaces on manpages-* when the version is

Modified: debian/trunk/debian/patches/463_login_delay_obeys_to_PAM
===================================================================
--- debian/trunk/debian/patches/463_login_delay_obeys_to_PAM	2008-09-13 17:04:57 UTC (rev 2375)
+++ debian/trunk/debian/patches/463_login_delay_obeys_to_PAM	2008-09-13 17:06:57 UTC (rev 2376)
@@ -51,21 +51,22 @@
 -		retcode = pam_fail_delay (pamh, 1000000 * delay);
 -		PAM_FAIL_CHECK;
 -#endif
- 		/* if fflg == 1, then the user has already been authenticated */
+ 		/* if fflg, then the user has already been authenticated */
  		if (!fflg || (getuid () != 0)) {
  			int failcount = 0;
-@@ -645,8 +639,6 @@
+@@ -645,9 +639,6 @@
  			  failed = 0;
  
  			  failcount++;
--			  if (delay > 0)
+-			  if (delay > 0) {
 -			    retcode = pam_fail_delay(pamh, 1000000*delay);
+-			  }
  
  			  retcode = pam_authenticate (pamh, 0);
  
-@@ -956,13 +948,16 @@
- 		if (pwent.pw_passwd[0] == '\0')
+@@ -956,14 +948,17 @@
  			pw_auth ("!", username, reason, (char *) 0);
+ 		}
  
 +#ifndef USE_PAM
  		/*
@@ -74,8 +75,9 @@
  		 * before the sleep() below completes, login will exit.
  		 */
 +		delay = getdef_num ("FAIL_DELAY", 1);
- 		if (delay > 0)
+ 		if (delay > 0) {
  			sleep (delay);
+		}
 +#endif
  
  		puts (_("Login incorrect"));