diff options
| author | Renato Botelho <garga@FreeBSD.org> | 2013-05-01 13:09:04 -0300 |
|---|---|---|
| committer | Renato Botelho <garga@FreeBSD.org> | 2013-05-01 13:09:04 -0300 |
| commit | ea1aca1326c79d5c819ec7c22c068b1c63074828 (patch) | |
| tree | 3ea3afab2142ad6a1a474d00f9cd122272b6631c /usr/local/www/services_dhcp.php | |
| parent | dfe2769c46d6f1a5fb29218e902901ea3ea080cb (diff) | |
| download | pfsense-ea1aca1326c79d5c819ec7c22c068b1c63074828.zip pfsense-ea1aca1326c79d5c819ec7c22c068b1c63074828.tar.gz | |
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
Diffstat (limited to 'usr/local/www/services_dhcp.php')
| -rwxr-xr-x | usr/local/www/services_dhcp.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr/local/www/services_dhcp.php b/usr/local/www/services_dhcp.php index 81c9b2b..6781ece 100755 --- a/usr/local/www/services_dhcp.php +++ b/usr/local/www/services_dhcp.php @@ -503,7 +503,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'); @@ -535,7 +535,7 @@ if ($act == "del") { write_config(); if(isset($config['dhcpd'][$if]['enable'])) { mark_subsystem_dirty('staticmaps'); - if (isset($config['dnsmasq']['regdhcpstatic'])) + if (isset($config['dnsmasq']['enable']) && isset($config['dnsmasq']['regdhcpstatic'])) mark_subsystem_dirty('hosts'); } header("Location: services_dhcp.php?if={$if}"); |
