[Pkg-shadow-devel] patch for upstream - s/syslog/SYSLOG/
Nicolas François
nicolas.francois@centraliens.net
Wed, 29 Jun 2005 22:49:00 +0200
--rwEMma7ioTxnRzrJ
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
Hi,
On Wed, Jun 29, 2005 at 10:27:13PM +0200, Nicolas Fran=E7ois wrote:
> I've also seen that some messages were directly sent to syslog by calli=
ng
> syslog. There is a SYSLOG macro which saves the locale, sets the locale=
to
> C, sends the message and restores the locale. This permits to avoid hav=
ing
> localized time (like "Ao=FB 01 xx:xx:xx").
>=20
> Tomasz, a patch for your CVS is attached.
Here is the promised patch.
--=20
Nekral
--rwEMma7ioTxnRzrJ
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename=shadow_syslog_SYSLOG
Index: src/login.c
===================================================================
RCS file: /cvsroot/shadow/src/login.c,v
retrieving revision 1.59
diff -u -r1.59 login.c
--- src/login.c 20 Jun 2005 09:36:27 -0000 1.59
+++ src/login.c 29 Jun 2005 19:59:22 -0000
@@ -58,7 +58,7 @@
#define PAM_FAIL_CHECK if (retcode != PAM_SUCCESS) { \
fprintf(stderr,"\n%s\n",pam_strerror(pamh, retcode)); \
- syslog(LOG_ERR,"%s",pam_strerror(pamh, retcode)); \
+ SYSLOG(LOG_ERR,"%s",pam_strerror(pamh, retcode)); \
pam_end(pamh, retcode); exit(1); \
}
#define PAM_END { retcode = pam_close_session(pamh,0); \
@@ -589,7 +591,7 @@
fprintf (stderr,
"login: PAM Failure, aborting: %s\n",
pam_strerror (pamh, retcode));
- syslog (LOG_ERR, "Couldn't initialize PAM: %s",
+ SYSLOG (LOG_ERR, "Couldn't initialize PAM: %s",
pam_strerror (pamh, retcode));
exit (99);
}
@@ -649,7 +651,7 @@
(retcode == PAM_AUTHINFO_UNAVAIL))) {
pam_get_item (pamh, PAM_USER,
(const void **) &pam_user);
- syslog (LOG_NOTICE,
+ SYSLOG (LOG_NOTICE,
"FAILED LOGIN %d FROM %s FOR %s, %s",
failcount, hostname, pam_user,
pam_strerror (pamh, retcode));
@@ -666,13 +668,13 @@
(const void **) &pam_user);
if (retcode == PAM_MAXTRIES)
- syslog (LOG_NOTICE,
+ SYSLOG (LOG_NOTICE,
"TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s",
failcount, hostname,
pam_user,
pam_strerror (pamh, retcode));
else
- syslog (LOG_NOTICE,
+ SYSLOG (LOG_NOTICE,
"FAILED LOGIN SESSION FROM %s FOR %s, %s",
hostname, pam_user,
pam_strerror (pamh, retcode));
Index: src/login_nopam.c
===================================================================
RCS file: /cvsroot/shadow/src/login_nopam.c,v
retrieving revision 1.3
diff -u -r1.3 login_nopam.c
--- src/login_nopam.c 17 Apr 2005 15:38:56 -0000 1.3
+++ src/login_nopam.c 29 Jun 2005 19:59:22 -0000
@@ -103,7 +103,7 @@
while (!match && fgets (line, sizeof (line), fp)) {
lineno++;
if (line[end = strlen (line) - 1] != '\n') {
- syslog (LOG_ERR,
+ SYSLOG (LOG_ERR,
"%s: line %d: missing newline or line too long",
TABLE, lineno);
continue;
@@ -119,13 +119,13 @@
|| !(users = strtok ((char *) 0, fs))
|| !(froms = strtok ((char *) 0, fs))
|| strtok ((char *) 0, fs)) {
- syslog (LOG_ERR,
+ SYSLOG (LOG_ERR,
"%s: line %d: bad field count",
TABLE, lineno);
continue;
}
if (perm[0] != '+' && perm[0] != '-') {
- syslog (LOG_ERR,
+ SYSLOG (LOG_ERR,
"%s: line %d: bad first field",
TABLE, lineno);
continue;
@@ -135,7 +135,7 @@
}
(void) fclose (fp);
} else if (errno != ENOENT) {
- syslog (LOG_ERR, "cannot open %s: %m", TABLE);
+ SYSLOG (LOG_ERR, "cannot open %s: %m", TABLE);
}
return (match == 0 || (line[0] == '+'));
}
@@ -262,7 +262,7 @@
if (hp)
return inet_ntoa (*((struct in_addr *) *(hp->h_addr_list)));
- syslog (LOG_ERR, "%s - unknown host", string);
+ SYSLOG (LOG_ERR, "%s - unknown host", string);
return string;
}
Index: src/sulogin.c
===================================================================
RCS file: /cvsroot/shadow/src/sulogin.c,v
retrieving revision 1.18
diff -u -r1.18 sulogin.c
--- src/sulogin.c 31 Mar 2005 05:14:54 -0000 1.18
+++ src/sulogin.c 29 Jun 2005 19:59:23 -0000
@@ -108,7 +108,7 @@
dup (0);
} else {
#ifdef USE_SYSLOG
- syslog (LOG_WARN, "cannot open %s\n", argv[1]);
+ SYSLOG (LOG_WARN, "cannot open %s\n", argv[1]);
closelog ();
#endif
exit (1);
@@ -117,7 +117,7 @@
if (access (PASSWD_FILE, F_OK) == -1) { /* must be a password file! */
printf (_("No password file\n"));
#ifdef USE_SYSLOG
- syslog (LOG_WARN, "No password file\n");
+ SYSLOG (LOG_WARN, "No password file\n");
closelog ();
#endif
exit (1);
@@ -125,7 +125,7 @@
#if !defined(DEBUG) && defined(SULOGIN_ONLY_INIT)
if (getppid () != 1) { /* parent must be INIT */
#ifdef USE_SYSLOG
- syslog (LOG_WARN, "Pid == %d, not 1\n", getppid ());
+ SYSLOG (LOG_WARN, "Pid == %d, not 1\n", getppid ());
closelog ();
#endif
exit (1);
@@ -159,7 +159,7 @@
printf (_("No password entry for 'root'\n"));
#ifdef USE_SYSLOG
- syslog (LOG_WARN, "No password entry for 'root'\n");
+ SYSLOG (LOG_WARN, "No password entry for 'root'\n");
closelog ();
#endif
exit (1);
@@ -181,7 +181,7 @@
*/
if (!cp || !*cp) {
#ifdef USE_SYSLOG
- syslog (LOG_INFO, "Normal startup\n");
+ SYSLOG (LOG_INFO, "Normal startup\n");
closelog ();
#endif
puts ("\n");
@@ -197,7 +197,7 @@
break; /* ... encrypted passwords matched */
#ifdef USE_SYSLOG
- syslog (LOG_WARN, "Incorrect root password\n");
+ SYSLOG (LOG_WARN, "Incorrect root password\n");
#endif
sleep (2);
puts (_("Login incorrect"));
@@ -209,7 +209,7 @@
puts (_("Entering System Maintenance Mode\n"));
#ifdef USE_SYSLOG
- syslog (LOG_INFO, "System Maintenance Mode\n");
+ SYSLOG (LOG_INFO, "System Maintenance Mode\n");
#endif
#ifdef USE_SYSLOG
--rwEMma7ioTxnRzrJ--