From c7e30c6bd0d63c6b43c9dbf29882822246f94884 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Tue, 23 Nov 2021 17:14:31 +0100 Subject: [PATCH] Follow-up to eb454d7: use time(NULL) instead of weird calculus Signed-off-by: Joachim Wiberg --- src/syslogd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/syslogd.c b/src/syslogd.c index 6ea4719..56efb9a 100644 --- a/src/syslogd.c +++ b/src/syslogd.c @@ -1046,7 +1046,7 @@ parsemsg_rfc3164(const char *from, int pri, char *msg) * This loop can only run for at most three * iterations before terminating. */ - t_now = boot_time + timer_now(); + t_now = time(NULL); localtime_r(&t_now, &tm_now); for (year = tm_now.tm_year + 1;; --year) { assert(year >= tm_now.tm_year - 1); @@ -1874,7 +1874,7 @@ void wallmsg(struct filed *f, struct iovec *iov, int iovcnt) * and doing notty(). */ if (fork() == 0) { - time_t t_now = boot_time + timer_now(); + time_t t_now = time(NULL); (void)signal(SIGTERM, SIG_DFL); (void)alarm(0);