- updated to 4.15.1, partial PLD merge

[packages/shadow.git] / pam-login-delay.patch

diff --git a/pam-login-delay.patch b/pam-login-delay.patch
index 550039c22f9eebe234283de11b00f299c56dd4f6..1009e7b9f22f670b35cb0f608d05572bc8fe96d0 100644 (file)
--- a/pam-login-delay.patch
+++ b/pam-login-delay.patch
@@ -1,7 +1,7 @@
-diff -urpa shadow-4.6.orig/lib/getdef.c shadow-4.6/lib/getdef.c
---- shadow-4.6.orig/lib/getdef.c       2018-04-29 16:42:37.000000000 +0000
-+++ shadow-4.6/lib/getdef.c    2018-09-04 14:28:30.649949349 +0000
-@@ -86,7 +86,6 @@ static struct itemdef def_table[] = {
+diff -urpa shadow-4.15.1.orig/lib/getdef.c shadow-4.15.1/lib/getdef.c
+--- shadow-4.15.1.orig/lib/getdef.c    2024-03-23 21:32:25.000000000 +0100
++++ shadow-4.15.1/lib/getdef.c 2024-04-02 13:16:27.781730965 +0200
+@@ -83,7 +83,6 @@ static struct itemdef def_table[] = {
        {"ENV_PATH", NULL},
        {"ENV_SUPATH", NULL},
        {"ERASECHAR", NULL},
@@ -9,26 +9,26 @@ diff -urpa shadow-4.6.orig/lib/getdef.c shadow-4.6/lib/getdef.c
        {"FAKE_SHELL", NULL},
        {"GID_MAX", NULL},
        {"GID_MIN", NULL},
-diff -urpa shadow-4.6.orig/src/login.c shadow-4.6/src/login.c
---- shadow-4.6.orig/src/login.c        2018-04-29 16:42:37.000000000 +0000
-+++ shadow-4.6/src/login.c     2018-09-04 14:27:39.281949927 +0000
-@@ -525,7 +525,6 @@ int main (int argc, char **argv)
- #if defined(HAVE_STRFTIME) && !defined(USE_PAM)
-       char ptime[80];
- #endif
--      unsigned int delay;
-       unsigned int retries;
-       bool subroot = false;
- #ifndef USE_PAM
-@@ -546,6 +545,7 @@ int main (int argc, char **argv)
-       pid_t child;
-       char *pam_user = NULL;
+diff -urpa shadow-4.15.1.orig/src/login.c shadow-4.15.1/src/login.c
+--- shadow-4.15.1.orig/src/login.c     2024-03-24 00:33:29.000000000 +0100
++++ shadow-4.15.1/src/login.c  2024-04-02 13:17:10.550309495 +0200
+@@ -489,7 +489,6 @@ int main (int argc, char **argv)
+       const char     *tmptty;
+       const char     *cp;
+       const char     *tmp;
+-      unsigned int   delay;
+       unsigned int   retries;
+       unsigned int   timeout;
+       struct passwd  *pwd = NULL;
+@@ -500,6 +499,7 @@ int main (int argc, char **argv)
+       pid_t          child;
  #else
-+      unsigned int delay;
+       bool is_console;
++      unsigned int   delay;
        struct spwd *spwd = NULL;
- #endif
-       /*
-@@ -708,7 +708,6 @@ int main (int argc, char **argv)
+ # if defined(ENABLE_LASTLOG)
+       char           ptime[80];
+@@ -667,7 +667,6 @@ int main (int argc, char **argv)
        }
  
        environ = newenvp;      /* make new environment active */
@@ -36,7 +36,7 @@ diff -urpa shadow-4.6.orig/src/login.c shadow-4.6/src/login.c
        retries = getdef_unum ("LOGIN_RETRIES", RETRIES);
  
  #ifdef USE_PAM
-@@ -724,8 +723,7 @@ int main (int argc, char **argv)
+@@ -683,8 +682,7 @@ int main (int argc, char **argv)
  
        /*
         * hostname & tty are either set to NULL or their correct values,
@@ -46,7 +46,7 @@ diff -urpa shadow-4.6.orig/src/login.c shadow-4.6/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)
-@@ -734,10 +732,6 @@ int main (int argc, char **argv)
+@@ -693,10 +691,6 @@ int main (int argc, char **argv)
        PAM_FAIL_CHECK;
        retcode = pam_set_item (pamh, PAM_TTY, tty);
        PAM_FAIL_CHECK;
@@ -56,8 +56,8 @@ diff -urpa shadow-4.6.orig/src/login.c shadow-4.6/src/login.c
 -#endif
        /* if fflg, then the user has already been authenticated */
        if (!fflg) {
-               unsigned int failcount = 0;
-@@ -778,12 +772,6 @@ int main (int argc, char **argv)
+               char          hostn[256];
+@@ -734,12 +728,6 @@ int main (int argc, char **argv)
                        bool failed = false;
  
                        failcount++;
@@ -70,7 +70,7 @@ diff -urpa shadow-4.6.orig/src/login.c shadow-4.6/src/login.c
  
                        retcode = pam_authenticate (pamh, 0);
  
-@@ -1073,14 +1061,17 @@ int main (int argc, char **argv)
+@@ -1029,14 +1017,17 @@ int main (int argc, char **argv)
                free (username);
                username = NULL;