[Pkg-shadow-commits] r2388 - in debian/trunk/debian: . patches

[nekral-guest at alioth.debian.org]

Author: nekral-guest
Date: 2008-09-13 17:23:17 +0000 (Sat, 13 Sep 2008)
New Revision: 2388

Modified:
   debian/trunk/debian/changelog
   debian/trunk/debian/patches/429_login_FAILLOG_ENAB
Log:
429_login_FAILLOG_ENAB updated for upstream version 4.1.2.


Modified: debian/trunk/debian/changelog
===================================================================
--- debian/trunk/debian/changelog	2008-09-13 17:22:30 UTC (rev 2387)
+++ debian/trunk/debian/changelog	2008-09-13 17:23:17 UTC (rev 2388)
@@ -11,6 +11,7 @@
       + debian/patches/008_su_get_PAM_username
       + debian/patches/302_vim_selinux_support
       + debian/patches/008_login_log_failure_in_FTMP
+      + debian/patches/429_login_FAILLOG_ENAB
   * debian/patches/506_relaxed_usernames: Use an extra paragraph for the note
     on username with a '/'.
   * debian/patches/504_undef_USE_PAM.dpatch:

Modified: debian/trunk/debian/patches/429_login_FAILLOG_ENAB
===================================================================
--- debian/trunk/debian/patches/429_login_FAILLOG_ENAB	2008-09-13 17:22:30 UTC (rev 2387)
+++ debian/trunk/debian/patches/429_login_FAILLOG_ENAB	2008-09-13 17:23:17 UTC (rev 2388)
@@ -49,7 +49,7 @@
 @@ -722,6 +731,8 @@
  #endif				/* WITH_AUDIT */
  
- 			  fprintf(stderr,"\nLogin incorrect\n");
+ 			  fprintf (stderr, "\nLogin incorrect\n");
 +			  if (pwd && getdef_bool("FAILLOG_ENAB"))
 +			    failure (pwent.pw_uid, tty, &faillog);
  			  if (getdef_str("FTMP_FILE") != NULL) {
@@ -60,16 +60,16 @@
  #ifndef USE_PAM
  		motd ();	/* print the message of the day */
 +#endif
- 		if (getdef_bool ("FAILLOG_ENAB")
- 		    && faillog.fail_cnt != 0) {
+ 		if (   getdef_bool ("FAILLOG_ENAB")
+ 		    && (0 != faillog.fail_cnt)) {
  			failprint (&faillog);
 @@ -1112,6 +1124,7 @@
  					 username, (int) faillog.fail_cnt));
  			}
  		}
 +#ifndef USE_PAM
- 		if (getdef_bool ("LASTLOG_ENAB")
- 		    && lastlog.ll_time != 0) {
+ 		if (   getdef_bool ("LASTLOG_ENAB")
+ 		    && (0 != lastlog.ll_time)) {
  			time_t ll_time = lastlog.ll_time;
 Index: shadow-4.1.0/lib/getdef.c
 ===================================================================