X-Git-Url: https://git.tld-linux.org/?p=packages%2Fshadow.git;a=blobdiff_plain;f=pam-login-delay.patch;fp=pam-login-delay.patch;h=1009e7b9f22f670b35cb0f608d05572bc8fe96d0;hp=153b30cd4ef48587f7bd492212a52bb8bce42e64;hb=de06f82ece157111a5195356df97a914100df70e;hpb=1e4373bf06b67f4b88cd354b9462e74945970f51

diff --git a/pam-login-delay.patch b/pam-login-delay.patch
index 153b30c..1009e7b 100644
--- a/pam-login-delay.patch
+++ b/pam-login-delay.patch
@@ -1,7 +1,7 @@
-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[] = {
+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.8.orig/lib/getdef.c shadow-4.8/lib/getdef.c
  	{"FAKE_SHELL", NULL},
  	{"GID_MAX", NULL},
  	{"GID_MIN", NULL},
-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
--	unsigned int delay;
- 	unsigned int retries;
- 	bool subroot = false;
- #ifndef USE_PAM
-@@ -561,6 +560,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
- 	/*
-@@ -723,7 +723,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.8.orig/src/login.c shadow-4.8/src/login.c
  	retries = getdef_unum ("LOGIN_RETRIES", RETRIES);
  
  #ifdef USE_PAM
-@@ -739,8 +738,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.8.orig/src/login.c shadow-4.8/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)
-@@ -749,10 +747,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.8.orig/src/login.c shadow-4.8/src/login.c
 -#endif
  	/* if fflg, then the user has already been authenticated */
  	if (!fflg) {
- 		unsigned int failcount = 0;
-@@ -793,12 +787,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.8.orig/src/login.c shadow-4.8/src/login.c
  
  			retcode = pam_authenticate (pamh, 0);
  
-@@ -1088,14 +1076,17 @@ int main (int argc, char **argv)
+@@ -1029,14 +1017,17 @@ int main (int argc, char **argv)
  		free (username);
  		username = NULL;