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/bandwidth_by_ip.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/bandwidth_by_ip.php')
| -rwxr-xr-x | usr/local/www/bandwidth_by_ip.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/usr/local/www/bandwidth_by_ip.php b/usr/local/www/bandwidth_by_ip.php index 8f91489..0140a74 100755 --- a/usr/local/www/bandwidth_by_ip.php +++ b/usr/local/www/bandwidth_by_ip.php @@ -42,7 +42,7 @@ $hostipformat = $_GET['hostipformat']; $iplookup = array(); // If hostname display is requested and the DNS forwarder does not already have DHCP static names registered, // then load the DHCP static mappings into an array keyed by IP address. -if (($hostipformat != "") && (!isset($config['dnsmasq']['regdhcpstatic']))) { +if (($hostipformat != "") && (!isset($config['dnsmasq']['enable']) || !isset($config['dnsmasq']['regdhcpstatic']))) { if (is_array($config['dhcpd'])) { foreach ($config['dhcpd'] as $ifdata) { if (is_array($ifdata['staticmap'])) { |
