summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorschwarze <schwarze@openbsd.org>2019-05-31 15:55:50 +0000
committerschwarze <schwarze@openbsd.org>2019-05-31 15:55:50 +0000
commitb65d5aa782ec99f92daaa00f2e78912f3755d8a0 (patch)
tree95dd5cebf08f6b78e220df8e3a3cacedd0b25dd8
parentAdd support for SNI with new "tls keypair" option to load additional certs. (diff)
downloadwireguard-openbsd-b65d5aa782ec99f92daaa00f2e78912f3755d8a0.tar.xz
wireguard-openbsd-b65d5aa782ec99f92daaa00f2e78912f3755d8a0.zip
Fix previous: create() got inadvertently moved after parse_config(),
which effectively caused the config file to be ignored. So move parse_config() back after create(). OK deraadt@
-rw-r--r--usr.sbin/sensorsd/sensorsd.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.sbin/sensorsd/sensorsd.c b/usr.sbin/sensorsd/sensorsd.c
index ba696e0f3a0..dea969afc16 100644
--- a/usr.sbin/sensorsd/sensorsd.c
+++ b/usr.sbin/sensorsd/sensorsd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sensorsd.c,v 1.64 2019/05/16 14:36:58 deraadt Exp $ */
+/* $OpenBSD: sensorsd.c,v 1.65 2019/05/31 15:55:50 schwarze Exp $ */
/*
* Copyright (c) 2003 Henning Brauer <henning@openbsd.org>
@@ -152,12 +152,12 @@ main(int argc, char *argv[])
if (pledge("stdio rpath proc exec", NULL) == -1)
err(1, "pledge");
- parse_config(configfile);
-
openlog("sensorsd", LOG_PID | LOG_NDELAY, LOG_DAEMON);
create();
+ parse_config(configfile);
+
if (debug == 0 && daemon(0, 0) == -1)
err(1, "unable to fork");