Index: dhcpleased.c =================================================================== RCS file: /cvs/src/sbin/dhcpleased/dhcpleased.c,v retrieving revision 1.23 diff -u -p -r1.23 dhcpleased.c --- dhcpleased.c 4 Jan 2022 06:20:37 -0000 1.23 +++ dhcpleased.c 20 Mar 2022 03:17:12 -0000 @@ -97,7 +97,7 @@ static struct imsgev *iev_engine; #ifndef SMALL struct dhcpleased_conf *main_conf; #endif -char *conffile; +char *conffile = _PATH_CONF_FILE; pid_t frontend_pid; pid_t engine_pid; @@ -308,13 +308,8 @@ main(int argc, char *argv[]) warnx("control socket setup failed"); #endif /* SMALL */ - if (conffile != NULL) { - if (unveil(conffile, "r") == -1) - fatal("unveil %s", conffile); - } else { - if (unveil(_PATH_CONF_FILE, "r") == -1) - fatal("unveil %s", _PATH_CONF_FILE); - } + if (unveil(conffile, "r") == -1) + fatal("unveil %s", conffile); if (unveil("/dev/bpf", "rw") == -1) fatal("unveil /dev/bpf"); Index: parse.y =================================================================== RCS file: /cvs/src/sbin/dhcpleased/parse.y,v retrieving revision 1.6 diff -u -p -r1.6 parse.y --- parse.y 4 Jan 2022 06:20:37 -0000 1.6 +++ parse.y 20 Mar 2022 03:17:12 -0000 @@ -726,7 +726,7 @@ parse_config(char *filename) conf = config_new_empty(); - file = pushfile(filename != NULL ? filename : _PATH_CONF_FILE, 0); + file = pushfile(filename, 0); if (file == NULL) { /* no default config file is fine */ if (errno == ENOENT && filename == NULL)