Updated for upstream version 4.1.2.
This commit is contained in:
1
debian/changelog
vendored
1
debian/changelog
vendored
@@ -4,6 +4,7 @@ shadow (1:4.1.2-1) experimental; urgency=low
|
||||
* 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
|
||||
|
||||
14
debian/patches/463_login_delay_obeys_to_PAM
vendored
14
debian/patches/463_login_delay_obeys_to_PAM
vendored
@@ -51,21 +51,22 @@ Index: shadow-4.1.0/src/login.c
|
||||
- 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 @@ Index: shadow-4.1.0/src/login.c
|
||||
* 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"));
|
||||
|
||||
Reference in New Issue
Block a user