[Pkg-shadow-commits] r450 - branches/experimental/debian/patches

[Christian Perrier]

Author: bubulle
Date: 2005-08-17 08:24:38 +0000 (Wed, 17 Aug 2005)
New Revision: 450

Modified:
   branches/experimental/debian/patches/429_login_FAILLOG_ENAB
Log:
Refresh to properly apply upstream


Modified: branches/experimental/debian/patches/429_login_FAILLOG_ENAB
===================================================================
--- branches/experimental/debian/patches/429_login_FAILLOG_ENAB	2005-08-17 08:22:46 UTC (rev 449)
+++ branches/experimental/debian/patches/429_login_FAILLOG_ENAB	2005-08-17 08:24:38 UTC (rev 450)
@@ -7,10 +7,10 @@
 Note: It could be removed if pam_tally could report the number of failures
       preceding a successful login.
 
-Index: shadow-4.0.10/src/login.c
+Index: shadow-4.0.12/src/login.c
 ===================================================================
---- shadow-4.0.10.orig/src/login.c	2005-07-11 19:39:14.000000000 +0300
-+++ shadow-4.0.10/src/login.c	2005-07-11 19:41:22.000000000 +0300
+--- shadow-4.0.12.orig/src/login.c	2005-08-17 10:21:20.000000000 +0200
++++ shadow-4.0.12/src/login.c	2005-08-17 10:23:53.000000000 +0200
 @@ -130,11 +130,11 @@
  static void setup_tty (void);
  static void check_flags (int, char *const *);
@@ -25,7 +25,7 @@
  static void bad_time_notify (void);
  static void check_nologin (void);
  #endif
-@@ -677,6 +677,8 @@
+@@ -683,6 +683,8 @@
  			    SYSLOG ((LOG_NOTICE,
  				    "TOO MANY LOGIN TRIES (%d)%s FOR `%s'",
  				    failcount, fromhost, failent_user));
@@ -34,8 +34,8 @@
  			    fprintf(stderr,
  				    _("Maximum number of tries exceeded (%d)\n"),
  				    failcount);
-@@ -694,11 +696,20 @@
- 				   pam_strerror (pamh, retcode));
+@@ -700,11 +702,20 @@
+ 				   pam_strerror (pamh, retcode)));
  			    failed = 1;
  			  }
 +			  if (pwd && getdef_bool("FAILLOG_ENAB") &&
@@ -55,7 +55,7 @@
  			  if (getdef_str("FTMP_FILE") != NULL) {
  #if HAVE_UTMPX_H
  			    failent = utxent;
-@@ -1059,6 +1070,7 @@
+@@ -1056,6 +1067,7 @@
  		 */
  #ifndef USE_PAM
  		motd ();	/* print the message of the day */
@@ -63,7 +63,7 @@
  		if (getdef_bool ("FAILLOG_ENAB")
  		    && faillog.fail_cnt != 0) {
  			failprint (&faillog);
-@@ -1072,6 +1084,7 @@
+@@ -1069,6 +1081,7 @@
  					 username, (int) faillog.fail_cnt));
  			}
  		}
@@ -71,20 +71,20 @@
  		if (getdef_bool ("LASTLOG_ENAB")
  		    && lastlog.ll_time != 0) {
  			time_t ll_time = lastlog.ll_time;
-Index: shadow-4.0.10/lib/getdef.c
+Index: shadow-4.0.12/lib/getdef.c
 ===================================================================
---- shadow-4.0.10.orig/lib/getdef.c	2005-07-11 19:41:09.000000000 +0300
-+++ shadow-4.0.10/lib/getdef.c	2005-07-11 19:41:44.000000000 +0300
-@@ -50,6 +50,7 @@
- 	{"CHFN_RESTRICT", NULL},
- 	{"DEFAULT_HOME", NULL},
+--- shadow-4.0.12.orig/lib/getdef.c	2005-08-17 10:21:20.000000000 +0200
++++ shadow-4.0.12/lib/getdef.c	2005-08-17 10:24:11.000000000 +0200
+@@ -56,6 +56,7 @@
+ 	{"ENV_SUPATH", NULL},
+ 	{"ERASECHAR", NULL},
  	{"FAIL_DELAY", NULL},
 +	{"FAILLOG_ENAB", NULL},
- 	{"FTMP_FILE", NULL},
- 	{"PASS_MAX_DAYS", NULL},
- 	{"PASS_MIN_DAYS", NULL},
-@@ -67,7 +68,6 @@
- 	{"ENV_SUPATH", NULL},
+ 	{"FAKE_SHELL", NULL},
+ 	{"GETPASS_ASTERISKS", NULL},
+ 	{"GID_MAX", NULL},
+@@ -87,7 +88,6 @@
+ 	{"ENV_HZ", NULL},
  	{"ENV_TZ", NULL},
  	{"ENVIRON_FILE", NULL},
 -	{"FAILLOG_ENAB", NULL},