[Pkg-shadow-commits] r374 - branches/experimental/debian/patches
Nicolas FRANCOIS
pkg-shadow-devel@lists.alioth.debian.org
Mon, 11 Jul 2005 13:09:00 +0000
Author: nekral-guest
Date: 2005-07-11 13:08:59 +0000 (Mon, 11 Jul 2005)
New Revision: 374
Modified:
branches/experimental/debian/patches/010_more-i18ned-messages
branches/experimental/debian/patches/429_login_FAILLOG_ENAB
branches/experimental/debian/patches/432_login_cancel_timout_after_authentication
branches/experimental/debian/patches/433_login_more_LOG_UNKFAIL_ENAB
branches/experimental/debian/patches/series
Log:
Another set of updates to 4.0.10
Modified: branches/experimental/debian/patches/010_more-i18ned-messages
===================================================================
--- branches/experimental/debian/patches/010_more-i18ned-messages 2005-07-11 04:50:47 UTC (rev 373)
+++ branches/experimental/debian/patches/010_more-i18ned-messages 2005-07-11 13:08:59 UTC (rev 374)
@@ -81,24 +81,15 @@
pam_strerror (pamh, retcode));
syslog (LOG_ERR, "Couldn't initialize PAM: %s",
pam_strerror (pamh, retcode));
-@@ -658,7 +658,7 @@
- #ifdef HAVE_PAM_FAIL_DELAY
- pam_fail_delay (pamh, 1000000 * delay);
- #endif
-- fprintf (stderr, "Login incorrect\n\n");
-+ fprintf (stderr, _("Login incorrect\n\n"));
- pam_set_item (pamh, PAM_USER, NULL);
- retcode = pam_authenticate (pamh, 0);
- }
-@@ -679,7 +679,7 @@
- hostname, pam_user,
- pam_strerror (pamh, retcode));
-
-- fprintf (stderr, "\nLogin incorrect\n");
-+ fprintf (stderr, _("\nLogin incorrect\n"));
- pam_end (pamh, retcode);
- exit (0);
- }
+@@ -837,7 +837,7 @@
+ if (!failed)
+ break;
+
+- fprintf(stderr,"Login incorrect\n\n");
++ fprintf(stderr,_("Login incorrect\n\n"));
+ if (pwd && getdef_bool("FAILLOG_ENAB"))
+ failure (pwent.pw_uid, tty, &faillog);
+ if (getdef_str("FTMP_FILE") != NULL) {
@@ -975,7 +975,7 @@
if (child < 0) {
/* error in fork() */
Modified: branches/experimental/debian/patches/429_login_FAILLOG_ENAB
===================================================================
--- branches/experimental/debian/patches/429_login_FAILLOG_ENAB 2005-07-11 04:50:47 UTC (rev 373)
+++ branches/experimental/debian/patches/429_login_FAILLOG_ENAB 2005-07-11 13:08:59 UTC (rev 374)
@@ -15,16 +15,20 @@
===================================================================
--- shadow-4.0.3.orig/src/login.c
+++ shadow-4.0.3/src/login.c
-@@ -160,9 +160,7 @@
- #define RETRIES 3
+@@ -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
-
--#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'"),
Modified: branches/experimental/debian/patches/432_login_cancel_timout_after_authentication
===================================================================
--- branches/experimental/debian/patches/432_login_cancel_timout_after_authentication 2005-07-11 04:50:47 UTC (rev 373)
+++ branches/experimental/debian/patches/432_login_cancel_timout_after_authentication 2005-07-11 13:08:59 UTC (rev 374)
@@ -7,13 +7,13 @@
Index: shadow-4.0.10/src/login.c
===================================================================
---- shadow-4.0.10.orig/src/login.c 2005-05-28 22:21:15.794189000 +0200
-+++ shadow-4.0.10/src/login.c 2005-05-28 22:21:22.214189000 +0200
-@@ -866,6 +866,7 @@
- exit (0);
+--- shadow-4.0.10.orig/src/login.c 2005-07-10 21:45:40.000000000 +0300
++++ shadow-4.0.10/src/login.c 2005-07-10 21:48:31.000000000 +0300
+@@ -730,6 +730,7 @@
}
-+ alarm(0);
+ /* We don't get here unless they were authenticated above */
++ alarm (0);
retcode = pam_acct_mgmt (pamh, 0);
if (retcode == PAM_NEW_AUTHTOK_REQD) {
Modified: branches/experimental/debian/patches/433_login_more_LOG_UNKFAIL_ENAB
===================================================================
--- branches/experimental/debian/patches/433_login_more_LOG_UNKFAIL_ENAB 2005-07-11 04:50:47 UTC (rev 373)
+++ branches/experimental/debian/patches/433_login_more_LOG_UNKFAIL_ENAB 2005-07-11 13:08:59 UTC (rev 374)
@@ -29,7 +29,7 @@
===================================================================
--- shadow-4.0.3.orig/src/login.c 2005-05-29 00:06:16.954189000 +0200
+++ shadow-4.0.3/src/login.c 2005-05-29 00:06:56.174189000 +0200
-@@ -775,49 +775,68 @@
+@@ -775,47 +775,68 @@
* MAX_LOGIN_TRIES?
*/
@@ -62,14 +62,12 @@
- "TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s",
- failcount, hostname,
- pam_user,
-- pam_strerror (pamh,
-- retcode));
+- pam_strerror (pamh, retcode));
- else
- syslog (LOG_NOTICE,
- "FAILED LOGIN SESSION FROM %s FOR %s, %s",
- hostname, pam_user,
-- pam_strerror (pamh,
-- retcode));
+- pam_strerror (pamh, retcode));
-
- fprintf (stderr, "\nLogin incorrect\n");
- pam_end (pamh, retcode);
Modified: branches/experimental/debian/patches/series
===================================================================
--- branches/experimental/debian/patches/series 2005-07-11 04:50:47 UTC (rev 373)
+++ branches/experimental/debian/patches/series 2005-07-11 13:08:59 UTC (rev 374)
@@ -1,6 +1,6 @@
# 001_Makefile.in.in.dpatch # This patch is the pure evil by patching gettext generated files
002_more-i18n.dpatch
-#354_Makefile.am
+#354_Makefile.am # applied
004_configure.in.dpatch
005_manpages.dpatch
336_chfn.1
@@ -37,10 +37,9 @@
428_grpck_add_prune_option
434_login_stop_checking_args_after--
# 349_login_opt-f_with_username_after-- # applied
-# 433_login_more_LOG_UNKFAIL_ENAB # This one is complicated. keep it for latter.
-# 008_login_log_failure_in_FTMP # This one requiers 433
-#
-# 429_login_FAILLOG_ENAB # Ignore it for now (see patch's header)
+433_login_more_LOG_UNKFAIL_ENAB
+008_login_log_failure_in_FTMP
+429_login_FAILLOG_ENAB
432_login_cancel_timout_after_authentication
# 355_login_close_session_as_root # applied
# 347_login_log_pam_user_if_USE_PAM # applied