From fada24d7c34207bf2ef5d377ee9568d5fa10af36 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Fri, 4 Jan 2019 07:42:12 +0100
Subject: [PATCH] unbound: don't stop unbound_dhcpd twice, small refactor

Also see: https://www.reddit.com/r/OPNsenseFirewall/comments/aac7xj/does_this_pfsense_dns_bug_with_dhcp_and_multiple/
---
 src/etc/inc/plugins.inc.d/unbound.inc | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/etc/inc/plugins.inc.d/unbound.inc b/src/etc/inc/plugins.inc.d/unbound.inc
index f76743617..7040c7edc 100644
--- a/src/etc/inc/plugins.inc.d/unbound.inc
+++ b/src/etc/inc/plugins.inc.d/unbound.inc
@@ -438,12 +438,11 @@ function unbound_configure_do($verbose = false, $interface = '')
 
     unbound_generate_config();
 
-    $domain = $config['system']['domain'];
-    if (isset($config['unbound']['regdhcpdomain'])) {
-        $domain = $config['unbound']['regdhcpdomain'];
-    }
-    killbypid('/var/run/unbound_dhcpd.pid', 'TERM', true);
     if (isset($config['unbound']['regdhcp'])) {
+        $domain = $config['system']['domain'];
+        if (isset($config['unbound']['regdhcpdomain'])) {
+            $domain = $config['unbound']['regdhcpdomain'];
+        }
         mwexecf('/usr/local/opnsense/scripts/dns/unbound_dhcpd.py /domain %s', $domain);
     }
     mwexecf('/usr/local/sbin/unbound -c %s', '/var/unbound/unbound.conf');