[Pkg-shadow-commits] r332 - trunk/debian/patches
Nicolas FRANCOIS
pkg-shadow-devel@lists.alioth.debian.org
Thu, 30 Jun 2005 06:23:48 +0000
Author: nekral-guest
Date: 2005-06-30 06:23:48 +0000 (Thu, 30 Jun 2005)
New Revision: 332
Modified:
trunk/debian/patches/010_more-i18ned-messages
Log:
010_more-i18ned-messages did not applied due to 429_login_FAILLOG_ENAB.
Modified: trunk/debian/patches/010_more-i18ned-messages
===================================================================
--- trunk/debian/patches/010_more-i18ned-messages 2005-06-29 23:33:37 UTC (rev 331)
+++ trunk/debian/patches/010_more-i18ned-messages 2005-06-30 06:23:48 UTC (rev 332)
@@ -85,7 +85,7 @@
===================================================================
--- shadow-4.0.3.orig/src/login.c 2005-06-13 20:06:07.000000000 +0200
+++ shadow-4.0.3/src/login.c 2005-06-13 20:06:09.000000000 +0200
-@@ -719,7 +719,7 @@
+@@ -717,7 +717,7 @@
retcode = pam_start ("login", username, &conv, &pamh);
if (retcode != PAM_SUCCESS) {
fprintf (stderr,
@@ -94,16 +94,16 @@
pam_strerror (pamh, retcode));
syslog (LOG_ERR, "Couldn't initialize PAM: %s",
pam_strerror (pamh, retcode));
-@@ -841,7 +841,7 @@
+@@ -837,7 +837,7 @@
if (!failed)
break;
- fprintf(stderr,"Login incorrect\n\n");
+ fprintf(stderr,_("Login incorrect\n\n"));
- #ifndef USE_PAM
if (pwd && getdef_bool("FAILLOG_ENAB"))
failure (pwent.pw_uid, tty, &faillog);
-@@ -1314,7 +1314,7 @@
+ if (getdef_str("FTMP_FILE") != NULL) {
+@@ -1304,7 +1304,7 @@
if (child < 0) {
/* error in fork() */
fprintf (stderr,
@@ -151,7 +151,7 @@
pam_strerror (pamh, ret));
pam_end (pamh, ret);
exit (1);
-@@ -562,7 +562,7 @@
+@@ -563,7 +563,7 @@
if (ret != PAM_SUCCESS) {
SYSLOG ((LOG_ERR, "pam_authenticate: %s",
pam_strerror (pamh, ret)));
@@ -160,7 +160,7 @@
pam_strerror (pamh, ret));
pam_end (pamh, ret);
su_failure (tty);
-@@ -576,7 +576,7 @@
+@@ -577,7 +577,7 @@
} else {
SYSLOG ((LOG_ERR, "pam_acct_mgmt: %s",
pam_strerror (pamh, ret)));
@@ -169,7 +169,7 @@
pam_strerror (pamh, ret));
pam_end (pamh, ret);
su_failure (tty);
-@@ -716,7 +716,7 @@
+@@ -718,7 +718,7 @@
if (ret != PAM_SUCCESS) {
SYSLOG ((LOG_ERR, "pam_setcred: %s",
pam_strerror (pamh, ret)));
@@ -178,7 +178,7 @@
pam_strerror (pamh, ret));
pam_end (pamh, ret);
exit (1);
-@@ -724,7 +724,7 @@
+@@ -726,7 +726,7 @@
ret = pam_open_session(pamh, 0);
if (ret != PAM_SUCCESS) {
SYSLOG((LOG_ERR, "pam_open_session: %s\n", pam_strerror(pamh, ret)));