- updated to 4.8

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

diff --git a/pam-login-delay.patch b/pam-login-delay.patch
index 550039c22f9eebe234283de11b00f299c56dd4f6..153b30cd4ef48587f7bd492212a52bb8bce42e64 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.8.orig/lib/getdef.c shadow-4.8/lib/getdef.c
+--- shadow-4.8.orig/lib/getdef.c       2019-12-01 18:02:43.000000000 +0100
++++ shadow-4.8/lib/getdef.c    2019-12-15 23:52:32.683000000 +0100
+@@ -89,7 +89,6 @@ static struct itemdef def_table[] = {
        {"ENV_PATH", NULL},
        {"ENV_SUPATH", NULL},
        {"ERASECHAR", NULL},
@@ -9,10 +9,10 @@ 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)
+diff -urpa shadow-4.8.orig/src/login.c shadow-4.8/src/login.c
+--- shadow-4.8.orig/src/login.c        2019-07-23 17:26:08.000000000 +0200
++++ shadow-4.8/src/login.c     2019-12-15 23:52:32.684000000 +0100
+@@ -536,7 +536,6 @@ int main (int argc, char **argv)
  #if defined(HAVE_STRFTIME) && !defined(USE_PAM)
        char ptime[80];
  #endif
@@ -20,7 +20,7 @@ diff -urpa shadow-4.6.orig/src/login.c shadow-4.6/src/login.c
        unsigned int retries;
        bool subroot = false;
  #ifndef USE_PAM
-@@ -546,6 +545,7 @@ int main (int argc, char **argv)
+@@ -561,6 +560,7 @@ int main (int argc, char **argv)
        pid_t child;
        char *pam_user = NULL;
  #else
@@ -28,7 +28,7 @@ diff -urpa shadow-4.6.orig/src/login.c shadow-4.6/src/login.c
        struct spwd *spwd = NULL;
  #endif
        /*
-@@ -708,7 +708,6 @@ int main (int argc, char **argv)
+@@ -723,7 +723,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)
+@@ -739,8 +738,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)
+@@ -749,10 +747,6 @@ int main (int argc, char **argv)
        PAM_FAIL_CHECK;
        retcode = pam_set_item (pamh, PAM_TTY, tty);
        PAM_FAIL_CHECK;
@@ -57,7 +57,7 @@ diff -urpa shadow-4.6.orig/src/login.c shadow-4.6/src/login.c
        /* 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)
+@@ -793,12 +787,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)
+@@ -1088,14 +1076,17 @@ int main (int argc, char **argv)
                free (username);
                username = NULL;