mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3112 from phil-davis/patch-1

Browse Source
This commit is contained in:
Renato Botelho 2016-08-29 15:04:02 -03:00
commit 067c8f5418
1 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/etc/inc/services.inc
View File

@ -516,6 +516,20 @@ function services_dhcpdv4_configure() {
$custoptions .= "option custom-{$dhcpif}-{$itemidx} code {$item['number']} = {$itemtype};\n";
}
}
if (is_array($dhcpifconf['pool'])) {
foreach ($dhcpifconf['pool'] as $poolidx => $poolconf) {
if (is_array($poolconf['numberoptions']) && is_array($poolconf['numberoptions']['item'])) {
foreach ($poolconf['numberoptions']['item'] as $itemidx => $item) {
if (!empty($item['type'])) {
$itemtype = $item['type'];
} else {
$itemtype = "text";
}
$custoptions .= "option custom-{$dhcpif}-{$poolidx}-{$itemidx} code {$item['number']} = {$itemtype};\n";
}
}
}
}
}
$dhcpdconf = <<<EOD
@ -754,7 +768,7 @@ EOPP;
$dhcpdconf .= "subnet {$subnet} netmask {$subnetmask} {\n";
// Setup pool options
foreach ($all_pools as $poolconf) {
foreach ($all_pools as $all_pools_idx => $poolconf) {
if (!(ip_in_subnet($poolconf['range']['from'], "{$subnet}/{$ifcfgsn}") && ip_in_subnet($poolconf['range']['to'], "{$subnet}/{$ifcfgsn}"))) {
// If the user has changed the subnet from the interfaces page and applied,
// but has not updated the DHCP range, then the range to/from of the pool can be outside the subnet.
@ -884,6 +898,23 @@ EOPP;
$dhcpdconf .= " option tftp-server-name \"{$poolconf['tftp']}\";\n";
}
// Handle pool-specific options
$dhcpdconf .= "\n";
// Ignore the first pool, which is the "overall" pool when $all_pools_idx is 0 - those are put outside the pool block later
if ($poolconf['numberoptions']['item'] && ($all_pools_idx > 0)) {
// Use the "real" pool index from the config, excluding the "overall" pool, and based from 0.
// This matches the way $poolidx was used when generating the $custoptions string earlier.
$poolidx = $all_pools_idx - 1;
foreach ($poolconf['numberoptions']['item'] as $itemidx => $item) {
$item_value = base64_decode($item['value']);
if (empty($item['type']) || $item['type'] == "text") {
$dhcpdconf .= " option custom-{$dhcpif}-{$poolidx}-{$itemidx} \"{$item_value}\";\n";
} else {
$dhcpdconf .= " option custom-{$dhcpif}-{$poolidx}-{$itemidx} {$item_value};\n";
}
}
}
// ldap-server
if (!empty($poolconf['ldap']) && ($poolconf['ldap'] != $dhcpifconf['ldap'])) {
$dhcpdconf .= " option ldap-server \"{$poolconf['ldap']}\";\n";