From 09f6b7bf6c0a940eba8b4c00506bf74bf811839f Mon Sep 17 00:00:00 2001 From: Joachim Nilsson Date: Wed, 13 Nov 2019 18:41:42 +0100 Subject: [PATCH] syslogd: Minor, don't log to console when exiting ... Signed-off-by: Joachim Nilsson --- src/syslogd.c | 7 +------ src/syslogd.h | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/syslogd.c b/src/syslogd.c index dc30eee..ee951f9 100644 --- a/src/syslogd.c +++ b/src/syslogd.c @@ -1980,19 +1980,14 @@ void debug_switch(int signo) void die(int signo) { struct filed *f, *next; - int was_initialized = Initialized; struct peer *pe, *penext; - Initialized = 0; /* Don't log SIGCHLDs in case we - receive one during exiting */ - - /* flush any pending output */ SIMPLEQ_FOREACH(f, &fhead, f_link) { + /* flush any pending output */ if (f->f_prevcount) fprintlog_successive(f, 0); } - Initialized = was_initialized; if (signo) { logit("syslogd: exiting on signal %d\n", signo); flog(LOG_SYSLOG | LOG_INFO, "exiting on signal %d", signo); diff --git a/src/syslogd.h b/src/syslogd.h index 9996c0a..8f372b8 100644 --- a/src/syslogd.h +++ b/src/syslogd.h @@ -199,6 +199,7 @@ struct peer { * to us. */ struct allowedpeer { + SIMPLEQ_ENTRY(allowedpeer) next; int isnumeric; u_short port; union { @@ -211,7 +212,6 @@ struct allowedpeer { #define a_addr u.numeric.addr #define a_mask u.numeric.mask #define a_name u.name - SIMPLEQ_ENTRY(allowedpeer) next; }; /* Timestamps of log entries. */