summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjoerg <joerg@FreeBSD.org>1997-03-14 01:27:02 +0000
committerjoerg <joerg@FreeBSD.org>1997-03-14 01:27:02 +0000
commitb66347858fd2e5d72afb12fa7d087938861723ac (patch)
treef1936f5250a78cce6b69cc42daa669146f3b4bfb
parenta7c87d03a03f50343d9fa91e541f9dfaa2b245c2 (diff)
downloadFreeBSD-src-b66347858fd2e5d72afb12fa7d087938861723ac.zip
FreeBSD-src-b66347858fd2e5d72afb12fa7d087938861723ac.tar.gz
Save and restore the state of the variable Initialized inside die().
Otherwise, the shutdown message will print out with 15 NUL bytes in front, due to a missing timestamp.
-rw-r--r--usr.sbin/syslogd/syslogd.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/usr.sbin/syslogd/syslogd.c b/usr.sbin/syslogd/syslogd.c
index bbb65ea..2bc9c76 100644
--- a/usr.sbin/syslogd/syslogd.c
+++ b/usr.sbin/syslogd/syslogd.c
@@ -39,7 +39,7 @@ static const char copyright[] =
static char sccsid[] = "@(#)syslogd.c 8.3 (Berkeley) 4/4/94";
*/
static const char rcsid[] =
- "$Id$";
+ "$Id: syslogd.c,v 1.20 1997/02/22 16:14:00 peter Exp $";
#endif /* not lint */
/*
@@ -1016,8 +1016,10 @@ die(signo)
int signo;
{
struct filed *f;
+ int was_initialized;
char buf[100];
+ was_initialized = Initialized;
Initialized = 0; /* Don't log SIGCHLDs. */
for (f = Files; f != NULL; f = f->f_next) {
/* flush any pending output */
@@ -1026,6 +1028,7 @@ die(signo)
if (f->f_type == F_PIPE)
(void)close(f->f_file);
}
+ Initialized = was_initialized;
if (signo) {
dprintf("syslogd: exiting on signal %d\n", signo);
(void)sprintf(buf, "exiting on signal %d", signo);
OpenPOWER on IntegriCloud