From 75d91570a056df20d60b95d1a8fe673263bb8f0f Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Tue, 20 Jul 2021 20:52:45 +0200
Subject: [PATCH] unbound: minimal cleanups, closes #4327

---
 src/www/services_unbound.php           | 4 ++--
 src/www/services_unbound_acls.php      | 1 -
 src/www/services_unbound_advanced.php  | 2 +-
 src/www/services_unbound_overrides.php | 2 --
 4 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/www/services_unbound.php b/src/www/services_unbound.php
index 0333f0dca..928d2cc40 100644
--- a/src/www/services_unbound.php
+++ b/src/www/services_unbound.php
@@ -62,9 +62,9 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
     $pconfig = $_POST;
 
     if (!empty($pconfig['apply'])) {
-        system_resolvconf_generate();
+        system_resolvconf_generate(); /* checks for 'enable' */
         unbound_configure_do();
-        plugins_configure('dhcp');
+        plugins_configure('dhcp'); /* checks for 'enable' */
         clear_subsystem_dirty('unbound');
         header(url_safe('Location: /services_unbound.php'));
         exit;
diff --git a/src/www/services_unbound_acls.php b/src/www/services_unbound_acls.php
index 07bcea0ec..1dac90f15 100644
--- a/src/www/services_unbound_acls.php
+++ b/src/www/services_unbound_acls.php
@@ -62,7 +62,6 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
 
     if (!empty($pconfig['apply'])) {
         unbound_configure_do();
-        plugins_configure('dhcp');
         clear_subsystem_dirty('unbound');
         header(url_safe('Location: /services_unbound_acls.php'));
         exit;
diff --git a/src/www/services_unbound_advanced.php b/src/www/services_unbound_advanced.php
index de3936c1a..624df178f 100644
--- a/src/www/services_unbound_advanced.php
+++ b/src/www/services_unbound_advanced.php
@@ -100,7 +100,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
     write_config('Unbound advanced configuration changed.');
 
     unbound_configure_do();
-    plugins_configure('dhcp');
+    clear_subsystem_dirty('unbound');
 
     header(url_safe('Location: /services_unbound_advanced.php'));
     exit;
diff --git a/src/www/services_unbound_overrides.php b/src/www/services_unbound_overrides.php
index b0ae051de..93c98ec74 100644
--- a/src/www/services_unbound_overrides.php
+++ b/src/www/services_unbound_overrides.php
@@ -46,9 +46,7 @@ foreach ($a_hosts as $i => $hostent) {
 if ($_SERVER['REQUEST_METHOD'] === 'POST') {
     $pconfig = $_POST;
     if (!empty($pconfig['apply'])) {
-        system_resolvconf_generate();
         unbound_configure_do();
-        plugins_configure('dhcp');
         clear_subsystem_dirty('unbound');
         header(url_safe('Location: /services_unbound_overrides.php'));
         exit;