From ea1aca1326c79d5c819ec7c22c068b1c63074828 Mon Sep 17 00:00:00 2001 From: Renato Botelho Date: Wed, 1 May 2013 13:09:04 -0300 Subject: Fix dnsmasq host overrides and dhcp integration . Do not execute following actions when dnsmasq is disabled: . Add host overrides to /etc/hosts . Register DHCP leases in DNS Forwarder . Register DHCP static mappings in DNS forwarder It should fix issue reported at following forum post: http://forum.pfsense.org/index.php?topic=58871 --- usr/local/www/services_dhcpv6.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'usr/local/www/services_dhcpv6.php') diff --git a/usr/local/www/services_dhcpv6.php b/usr/local/www/services_dhcpv6.php index fe5fe5f..7872721 100644 --- a/usr/local/www/services_dhcpv6.php +++ b/usr/local/www/services_dhcpv6.php @@ -328,7 +328,7 @@ if ($_POST) { // dhcp_clean_leases(); /* dnsmasq_configure calls dhcpd_configure */ /* no need to restart dhcpd twice */ - if (isset($config['dnsmasq']['regdhcpstatic'])) { + if (isset($config['dnsmasq']['enable']) && isset($config['dnsmasq']['regdhcpstatic'])) { $retvaldns = services_dnsmasq_configure(); if ($retvaldns == 0) { clear_subsystem_dirty('hosts'); @@ -351,7 +351,7 @@ if ($_GET['act'] == "del") { write_config(); if(isset($config['dhcpdv6'][$if]['enable'])) { mark_subsystem_dirty('staticmapsv6'); - if (isset($config['dnsmasq']['regdhcpstaticv6'])) + if (isset($config['dnsmasq']['enable']) && isset($config['dnsmasq']['regdhcpstaticv6'])) mark_subsystem_dirty('hosts'); } header("Location: services_dhcpv6.php?if={$if}"); -- cgit v1.1