From d592f494b6609a336ff8771e1c8edcba4957e2da Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Tue, 23 Apr 2019 12:20:47 +0200 Subject: [PATCH] unbound: looks safe to drop hardcoded service include --- src/etc/inc/services.inc | 1 - src/www/services_unbound.php | 1 + src/www/services_unbound_advanced.php | 1 + src/www/services_unbound_overrides.php | 1 + 4 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/etc/inc/services.inc b/src/etc/inc/services.inc index 699b1e720..c1d6e1825 100644 --- a/src/etc/inc/services.inc +++ b/src/etc/inc/services.inc @@ -46,7 +46,6 @@ require_once('plugins.inc.d/dnsmasq.inc'); require_once('plugins.inc.d/ipsec.inc'); require_once('plugins.inc.d/openvpn.inc'); -require_once('plugins.inc.d/unbound.inc'); function generate_ipv6_from_mac($mac) { diff --git a/src/www/services_unbound.php b/src/www/services_unbound.php index 611f92db9..13e188758 100644 --- a/src/www/services_unbound.php +++ b/src/www/services_unbound.php @@ -33,6 +33,7 @@ require_once("guiconfig.inc"); require_once("services.inc"); require_once("system.inc"); require_once("interfaces.inc"); +require_once("plugins.inc.d/unbound.inc"); $a_unboundcfg = &config_read_array('unbound'); diff --git a/src/www/services_unbound_advanced.php b/src/www/services_unbound_advanced.php index d81e3fa15..194e95e63 100644 --- a/src/www/services_unbound_advanced.php +++ b/src/www/services_unbound_advanced.php @@ -30,6 +30,7 @@ require_once("guiconfig.inc"); require_once("system.inc"); require_once("services.inc"); +require_once("plugins.inc.d/unbound.inc"); config_read_array('unbound'); diff --git a/src/www/services_unbound_overrides.php b/src/www/services_unbound_overrides.php index effb007be..09e722120 100644 --- a/src/www/services_unbound_overrides.php +++ b/src/www/services_unbound_overrides.php @@ -32,6 +32,7 @@ require_once("guiconfig.inc"); require_once("services.inc"); require_once("system.inc"); require_once("interfaces.inc"); +require_once("plugins.inc.d/unbound.inc"); $a_hosts = &config_read_array('unbound', 'hosts'); $a_domains = &config_read_array('unbound', 'domainoverrides');