summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Obser <florian@cvs.openbsd.org>2019-12-06 13:08:48 +0000
committerFlorian Obser <florian@cvs.openbsd.org>2019-12-06 13:08:48 +0000
commit8c323633e1a4f391bcd7c5fd8a7edaf3a93b44ec (patch)
tree387b076a7b225914a45d42374cf98779ecdcd81e
parent2af98ef3dd9eeab94c2e406acd27a8a553203129 (diff)
Stop fiddling with openlog / closelog in libunbound. unwind handles
this. We need to find a way to properly upstream this. OK otto
-rw-r--r--sbin/unwind/libunbound/util/log.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/sbin/unwind/libunbound/util/log.c b/sbin/unwind/libunbound/util/log.c
index 318ff1d7910..0103f2cd583 100644
--- a/sbin/unwind/libunbound/util/log.c
+++ b/sbin/unwind/libunbound/util/log.c
@@ -108,14 +108,18 @@ log_init(const char* filename, int use_syslog, const char* chrootdir)
fclose(cl);
}
#ifdef HAVE_SYSLOG_H
+#if 0 /* unwind handles syslog for us */
if(logging_to_syslog) {
closelog();
logging_to_syslog = 0;
}
+#endif
if(use_syslog) {
/* do not delay opening until first write, because we may
* chroot and no longer be able to access dev/log and so on */
+#if 0 /* unwind handles syslog for us */
openlog(ident, LOG_NDELAY, LOG_DAEMON);
+#endif
logging_to_syslog = 1;
lock_quick_unlock(&log_lock);
return;