diff --git a/debian/changelog b/debian/changelog index 592bfb99..d6bbd9d3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,7 @@ shadow (1:4.1.2-1) experimental; urgency=low + 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: diff --git a/debian/patches/429_login_FAILLOG_ENAB b/debian/patches/429_login_FAILLOG_ENAB index d4951fa4..24863eae 100644 --- a/debian/patches/429_login_FAILLOG_ENAB +++ b/debian/patches/429_login_FAILLOG_ENAB @@ -49,7 +49,7 @@ Index: shadow-4.1.0/src/login.c @@ -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 @@ Index: shadow-4.1.0/src/login.c #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 ===================================================================