[Pkg-shadow-commits] r314 - trunk/debian/patches

[Nicolas FRANCOIS]

Author: nekral-guest
Date: 2005-06-29 00:33:59 +0000 (Wed, 29 Jun 2005)
New Revision: 314

Added:
   trunk/debian/patches/429_login_FAILLOG_ENAB
Removed:
   trunk/debian/patches/008_login_FAILLOG_ENAB
Modified:
   trunk/debian/patches/series
Log:
We will keep 008_login_FAILLOG_ENAB until pam_tally permits to indicate the
user that there were failures before he successfully login.
Move it to 429 for the moment.


Deleted: trunk/debian/patches/008_login_FAILLOG_ENAB
===================================================================
--- trunk/debian/patches/008_login_FAILLOG_ENAB	2005-06-29 00:30:50 UTC (rev 313)
+++ trunk/debian/patches/008_login_FAILLOG_ENAB	2005-06-29 00:33:59 UTC (rev 314)
@@ -1,73 +0,0 @@
-Goal: ??
-Depends: 008_login_more_LOG_UNKFAIL_ENAB
-
-Notes:
- * I've not found a related entry in the changelog.
- * This patch looks strang to me. It adds #ifndef USE_PAM in section already
-   enclosed by either #ifdef USE_PAM or #ifndef USE_PAM.
-
-   IMHO, it should ignored or rewritten.
-
- src/login.c |   15 +++++++++++++--
- 1 files changed, 13 insertions(+), 2 deletions(-)
-
-Index: shadow-4.0.3/src/login.c
-===================================================================
---- shadow-4.0.3.orig/src/login.c
-+++ shadow-4.0.3/src/login.c
-@@ -160,9 +160,7 @@
- #define	RETRIES	3
- #endif
- 
--#ifndef USE_PAM
- static struct faillog faillog;
--#endif
- 
- /* local function prototypes */
- static void usage (void);
-@@ -809,6 +807,8 @@
- 			    syslog (LOG_NOTICE,
- 				    _("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 @@
- 				   pam_strerror (pamh, retcode));
- 			    failed = 1;
- 			  }
-+			  if (pwd && getdef_bool("FAILLOG_ENAB") &&
-+			      ! failcheck (pwent.pw_uid, &faillog, failed)) {
-+			    SYSLOG((LOG_CRIT,
-+			           "exceeded failure limit for `%s' %s",
-+			           failent_user, fromhost));
-+			    failed = 1;
-+			  }
- 
- 			  if (!failed)
- 			    break;
- 			  
- 			  fprintf(stderr,"Login incorrect\n\n");
-+			  if (pwd && getdef_bool("FAILLOG_ENAB"))
-+			    failure (pwent.pw_uid, tty, &faillog);
- 			  if (getdef_str("FTMP_FILE") != NULL) {
- #if HAVE_UTMPX_H
- 			    failent = utxent;
-@@ -1300,6 +1309,7 @@
- 		 */
- #ifndef USE_PAM
- 		motd ();	/* print the message of the day */
-+#endif
- 		if (getdef_bool ("FAILLOG_ENAB")
- 		    && faillog.fail_cnt != 0) {
- 			failprint (&faillog);
-@@ -1314,6 +1324,7 @@
- 					 (int) faillog.fail_cnt));
- 			}
- 		}
-+#ifndef USE_PAM
- 		if (getdef_bool ("LASTLOG_ENAB")
- 		    && lastlog.ll_time != 0) {
- #ifdef HAVE_STRFTIME

Copied: trunk/debian/patches/429_login_FAILLOG_ENAB (from rev 312, trunk/debian/patches/008_login_FAILLOG_ENAB)

Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series	2005-06-29 00:30:50 UTC (rev 313)
+++ trunk/debian/patches/series	2005-06-29 00:33:59 UTC (rev 314)
@@ -36,7 +36,7 @@
 349_login_opt-f_with_username_after--
 008_login_more_LOG_UNKFAIL_ENAB
 008_login_log_failure_in_FTMP
-008_login_FAILLOG_ENAB
+429_login_FAILLOG_ENAB
 008_login_cancel_timout_after_authentication
 355_login_close_session_as_root
 347_login_log_pam_user_if_USE_PAM