diff options
| author |   bluhm <bluhm@openbsd.org> | 2015-12-16 13:38:39 +0000 |
|---|---|---|
| committer | bluhm <bluhm@openbsd.org> | 2015-12-16 13:38:39 +0000 |
| commit | 59c7b1366f33869b9b532d27d46098b5eee3c670 (patch) | |
| tree | ab8dfd96c1cd514d44196e2eef582ce127ff8c3b /usr.sbin/syslogd/syslogd.c | |
| parent | Merge rtable_mpath_select() into rtable_match(). (diff) | |
| download | wireguard-openbsd-59c7b1366f33869b9b532d27d46098b5eee3c670.tar.xz wireguard-openbsd-59c7b1366f33869b9b532d27d46098b5eee3c670.zip | |
Adding mark messages to log files was broken since OpenBSD 5.7.
The mark timeout event is not persistent, add the timer intervall
everytime it fires.
Bug report, analysis and fix from Einfach Jemand rru.142 at gmail.com
Diffstat (limited to 'usr.sbin/syslogd/syslogd.c')
| -rw-r--r-- | usr.sbin/syslogd/syslogd.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/usr.sbin/syslogd/syslogd.c b/usr.sbin/syslogd/syslogd.c index e9fc07e60ce..cf48af785de 100644 --- a/usr.sbin/syslogd/syslogd.c +++ b/usr.sbin/syslogd/syslogd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: syslogd.c,v 1.201 2015/10/24 12:49:37 bluhm Exp $ */ +/* $OpenBSD: syslogd.c,v 1.202 2015/12/16 13:38:39 bluhm Exp $ */ /* * Copyright (c) 1983, 1988, 1993, 1994 @@ -1995,7 +1995,14 @@ die_signalcb(int signum, short event, void *arg) void mark_timercb(int unused, short event, void *arg) { + struct event *ev = arg; + struct timeval to; + markit(); + + to.tv_sec = TIMERINTVL; + to.tv_usec = 0; + evtimer_add(ev, &to); } void |