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

[Nicolas FRANCOIS]

Author: nekral-guest
Date: 2005-07-24 20:43:00 +0000 (Sun, 24 Jul 2005)
New Revision: 402

Modified:
   branches/experimental/debian/patches/429_login_FAILLOG_ENAB
Log:
Update to 4.0.11.
Also add FAILLOG_ENAB variable to the getdef.c table.


Modified: branches/experimental/debian/patches/429_login_FAILLOG_ENAB
===================================================================
--- branches/experimental/debian/patches/429_login_FAILLOG_ENAB	2005-07-24 20:40:09 UTC (rev 401)
+++ branches/experimental/debian/patches/429_login_FAILLOG_ENAB	2005-07-24 20:43:00 UTC (rev 402)
@@ -11,34 +11,34 @@
  src/login.c |   15 +++++++++++++--
  1 files changed, 13 insertions(+), 2 deletions(-)
 
-Index: shadow-4.0.3/src/login.c
+Index: shadow-4.0.10/src/login.c
 ===================================================================
---- shadow-4.0.3.orig/src/login.c
-+++ shadow-4.0.3/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
 @@ -130,11 +130,11 @@
  static void setup_tty (void);
  static void check_flags (int, char *const *);
-
+ 
 +static struct faillog faillog;
 +
  #ifndef USE_PAM
  extern int login_access (const char *, const char *);
-
+ 
 -static struct faillog faillog;
 -
  static void bad_time_notify (void);
  static void check_nologin (void);
  #endif
-@@ -809,6 +807,8 @@
+@@ -677,6 +677,8 @@
  			    syslog (LOG_NOTICE,
- 				    _("TOO MANY LOGIN TRIES (%d)%s FOR `%s'"),
+ 				    "TOO MANY LOGIN TRIES (%d)%s FOR `%s'",
  				    failcount, fromhost, failent_user);
 +			    if (pwd && getdef_bool("FAILLOG_ENAB"))
 +			      failure (pwent.pw_uid, tty, &faillog);
  			    fprintf(stderr,
  				    _("Maximum number of tries exceeded (%d)\n"),
  				    failcount);
-@@ -826,11 +826,20 @@
+@@ -694,11 +696,20 @@
  				   pam_strerror (pamh, retcode));
  			    failed = 1;
  			  }
@@ -59,7 +59,7 @@
  			  if (getdef_str("FTMP_FILE") != NULL) {
  #if HAVE_UTMPX_H
  			    failent = utxent;
-@@ -1300,6 +1309,7 @@
+@@ -1059,6 +1070,7 @@
  		 */
  #ifndef USE_PAM
  		motd ();	/* print the message of the day */
@@ -67,11 +67,31 @@
  		if (getdef_bool ("FAILLOG_ENAB")
  		    && faillog.fail_cnt != 0) {
  			failprint (&faillog);
-@@ -1314,6 +1324,7 @@
- 					 (int) faillog.fail_cnt));
+@@ -1072,6 +1084,7 @@
+ 					 username, (int) faillog.fail_cnt));
  			}
  		}
 +#ifndef USE_PAM
  		if (getdef_bool ("LASTLOG_ENAB")
  		    && lastlog.ll_time != 0) {
- #ifdef HAVE_STRFTIME
+ 			time_t ll_time = lastlog.ll_time;
+Index: shadow-4.0.10/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},
+ 	{"FAIL_DELAY", NULL},
++	{"FAILLOG_ENAB", NULL},
+ 	{"FTMP_FILE", NULL},
+ 	{"PASS_MAX_DAYS", NULL},
+ 	{"PASS_MIN_DAYS", NULL},
+@@ -67,7 +68,6 @@
+ 	{"ENV_SUPATH", NULL},
+ 	{"ENV_TZ", NULL},
+ 	{"ENVIRON_FILE", NULL},
+-	{"FAILLOG_ENAB", NULL},
+ 	{"ISSUE_FILE", NULL},
+ 	{"LASTLOG_ENAB", NULL},
+ 	{"LOGIN_STRING", NULL},