summaryrefslogtreecommitdiffstats
path: root/src/etc
diff options
context:
space:
mode:
authork-paulius <k.dash.paulius@gmail.com>2016-05-12 23:24:13 -0500
committerChris Buechler <cmb@pfsense.org>2016-05-13 01:30:57 -0500
commit361b388b4471d1b4a61d83d6003b68bd375c6058 (patch)
treefbe1f107ceddf2e9797fc7c9234ac4ba68c3ad0b /src/etc
parent3ded329e23980d52771cd7194ca31fe3481be21b (diff)
downloadpfsense-361b388b4471d1b4a61d83d6003b68bd375c6058.zip
pfsense-361b388b4471d1b4a61d83d6003b68bd375c6058.tar.gz
Unbound and dnsmasq can both be enabled so restart both if need be
Diffstat (limited to 'src/etc')
-rw-r--r--src/etc/inc/interfaces.inc10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/etc/inc/interfaces.inc b/src/etc/inc/interfaces.inc
index 36cb8d6..c70333c 100644
--- a/src/etc/inc/interfaces.inc
+++ b/src/etc/inc/interfaces.inc
@@ -1204,10 +1204,11 @@ function interfaces_configure() {
/* reload dhcpd (interface enabled/disabled status may have changed) */
services_dhcpd_configure();
- /* restart dnsmasq or unbound */
if (isset($config['dnsmasq']['enable'])) {
services_dnsmasq_configure();
- } elseif (isset($config['unbound']['enable'])) {
+ }
+
+ if (isset($config['unbound']['enable'])) {
services_unbound_configure();
}
}
@@ -3469,10 +3470,11 @@ function interface_configure($interface = "wan", $reloadall = false, $linkupeven
/* reload ipsec tunnels */
send_event("service reload ipsecdns");
- /* restart dnsmasq or unbound */
if (isset($config['dnsmasq']['enable'])) {
services_dnsmasq_configure();
- } elseif (isset($config['unbound']['enable'])) {
+ }
+
+ if (isset($config['unbound']['enable'])) {
services_unbound_configure();
}
OpenPOWER on IntegriCloud