diff options
| author | Renato Botelho <garga@FreeBSD.org> | 2013-01-23 11:04:54 -0200 |
|---|---|---|
| committer | Renato Botelho <garga@FreeBSD.org> | 2013-01-23 11:04:54 -0200 |
| commit | fa7b825f901c24d6de91ce980a651eddb5f15abb (patch) | |
| tree | bf7c80d3cf7aec89fcccd7906a13ce6e8af1dc94 | |
| parent | b75d7fd513b701bcc726627f6986c5e3fd540f1d (diff) | |
| download | pfsense-fa7b825f901c24d6de91ce980a651eddb5f15abb.zip pfsense-fa7b825f901c24d6de91ce980a651eddb5f15abb.tar.gz | |
Fix some DHCP per pool options that will never be considered because of a wrong check
| -rw-r--r-- | etc/inc/services.inc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/etc/inc/services.inc b/etc/inc/services.inc index 82f11db..da5f340 100644 --- a/etc/inc/services.inc +++ b/etc/inc/services.inc @@ -616,7 +616,7 @@ EOPP; $pdnscfg .= " ddns-update-style interim;\n"; } - if (is_array($poolconf['dnsserver']) && ($poolconf['dnsserver'][0]) && ($poolconf['dnsserver'][0] != $poolconf['dnsserver'][0])) { + if (is_array($poolconf['dnsserver']) && ($poolconf['dnsserver'][0]) && ($poolconf['dnsserver'][0] != $dhcpifconf['dnsserver'][0])) { $pdnscfg .= " option domain-name-servers " . join(",", $poolconf['dnsserver']) . ";\n"; } $dhcpdconf .= "{$pdnscfg}"; @@ -630,13 +630,13 @@ EOPP; $dhcpdconf .= " max-lease-time {$poolconf['maxleasetime']};\n"; // netbios-name* - if (is_array($poolconf['winsserver']) && $poolconf['winsserver'][0] && ($poolconf['winsserver'][0] != $poolconf['winsserver'][0])) { + if (is_array($poolconf['winsserver']) && $poolconf['winsserver'][0] && ($poolconf['winsserver'][0] != $dhcpifconf['winsserver'][0])) { $dhcpdconf .= " option netbios-name-servers " . join(",", $poolconf['winsserver']) . ";\n"; $dhcpdconf .= " option netbios-node-type 8;\n"; } // ntp-servers - if (is_array($poolconf['ntpserver']) && $poolconf['ntpserver'][0] && ($poolconf['ntpserver'][0] != $poolconf['ntpserver'][0])) + if (is_array($poolconf['ntpserver']) && $poolconf['ntpserver'][0] && ($poolconf['ntpserver'][0] != $dhcpifconf['ntpserver'][0])) $dhcpdconf .= " option ntp-servers " . join(",", $poolconf['ntpserver']) . ";\n"; // tftp-server-name |
