diff options
Diffstat (limited to 'debian/patches/463_login_delay_obeys_to_PAM')
| -rw-r--r-- | debian/patches/463_login_delay_obeys_to_PAM | 34 |
1 files changed, 13 insertions, 21 deletions
diff --git a/debian/patches/463_login_delay_obeys_to_PAM b/debian/patches/463_login_delay_obeys_to_PAM index 6dbe05d9..a0510d7a 100644 --- a/debian/patches/463_login_delay_obeys_to_PAM +++ b/debian/patches/463_login_delay_obeys_to_PAM @@ -7,10 +7,10 @@ Status wrt upstream: Forwarded but not applied yet Note: If removed, FAIL_DELAY must be re-added to /etc/login.defs -Index: shadow-4.3/src/login.c +Index: shadow-4.4/src/login.c =================================================================== ---- shadow-4.3.orig/src/login.c -+++ shadow-4.3/src/login.c +--- shadow-4.4.orig/src/login.c ++++ shadow-4.4/src/login.c @@ -525,7 +525,6 @@ int main (int argc, char **argv) #if defined(HAVE_STRFTIME) && !defined(USE_PAM) char ptime[80]; @@ -19,7 +19,7 @@ Index: shadow-4.3/src/login.c unsigned int retries; bool subroot = false; #ifndef USE_PAM -@@ -545,6 +544,7 @@ int main (int argc, char **argv) +@@ -546,6 +545,7 @@ int main (int argc, char **argv) pid_t child; char *pam_user = NULL; #else @@ -27,7 +27,7 @@ Index: shadow-4.3/src/login.c struct spwd *spwd = NULL; #endif /* -@@ -705,7 +705,6 @@ int main (int argc, char **argv) +@@ -708,7 +708,6 @@ int main (int argc, char **argv) } environ = newenvp; /* make new environment active */ @@ -35,7 +35,7 @@ Index: shadow-4.3/src/login.c retries = getdef_unum ("LOGIN_RETRIES", RETRIES); #ifdef USE_PAM -@@ -721,8 +720,7 @@ int main (int argc, char **argv) +@@ -724,8 +723,7 @@ int main (int argc, char **argv) /* * hostname & tty are either set to NULL or their correct values, @@ -45,7 +45,7 @@ Index: shadow-4.3/src/login.c * * PAM_RHOST and PAM_TTY are used for authentication, only use * information coming from login or from the caller (e.g. no utmp) -@@ -731,10 +729,6 @@ int main (int argc, char **argv) +@@ -734,10 +732,6 @@ int main (int argc, char **argv) PAM_FAIL_CHECK; retcode = pam_set_item (pamh, PAM_TTY, tty); PAM_FAIL_CHECK; @@ -56,7 +56,7 @@ Index: shadow-4.3/src/login.c /* if fflg, then the user has already been authenticated */ if (!fflg) { unsigned int failcount = 0; -@@ -775,12 +769,6 @@ int main (int argc, char **argv) +@@ -778,12 +772,6 @@ int main (int argc, char **argv) bool failed = false; failcount++; @@ -69,7 +69,7 @@ Index: shadow-4.3/src/login.c retcode = pam_authenticate (pamh, 0); -@@ -1103,14 +1091,17 @@ int main (int argc, char **argv) +@@ -1106,14 +1094,17 @@ int main (int argc, char **argv) free (username); username = NULL; @@ -87,19 +87,11 @@ Index: shadow-4.3/src/login.c (void) puts (_("Login incorrect")); -Index: shadow-4.3/lib/getdef.c +Index: shadow-4.4/lib/getdef.c =================================================================== ---- shadow-4.3.orig/lib/getdef.c -+++ shadow-4.3/lib/getdef.c -@@ -56,6 +56,7 @@ struct itemdef { - {"ENV_HZ", NULL}, \ - {"ENVIRON_FILE", NULL}, \ - {"ENV_TZ", NULL}, \ -+ {"FAIL_DELAY", NULL}, \ - {"ISSUE_FILE", NULL}, \ - {"LASTLOG_ENAB", NULL}, \ - {"LOGIN_STRING", NULL}, \ -@@ -84,7 +85,6 @@ static struct itemdef def_table[] = { +--- shadow-4.4.orig/lib/getdef.c ++++ shadow-4.4/lib/getdef.c +@@ -85,7 +85,6 @@ static struct itemdef def_table[] = { {"ENV_PATH", NULL}, {"ENV_SUPATH", NULL}, {"ERASECHAR", NULL}, |