lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-20 03:16:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

dhcp: partially revert for #1250, it works, bug elsewhere

Browse Source
This commit is contained in:
Franco Fichtner 2016-11-18 14:34:49 +01:00
parent 7f2e31e6d7
commit ce3bc6112d
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -414,6 +414,7 @@ function services_dhcpdv4_configure($verbose = false)
}
}
$dhcpdconf = <<<EOD
option domain-name "{$config['system']['domain']}";
option ldap-server code 95 = text;
option domain-search-list code 119 = text;
option arch code 93 = unsigned integer 16; # RFC4578
@ -532,8 +533,6 @@ EOPP;
if (!empty($dhcpifconf['domain'])) {
$dnscfg .= " option domain-name \"{$dhcpifconf['domain']}\";\n";
} else {
$dnscfg .= " option domain-name \"{$config['system']['domain']}\";\n";
}
if (!empty($dhcpifconf['domainsearchlist'])) {
@ -1095,6 +1094,7 @@ function services_dhcpdv6_configure($blacklist = array(), $verbose = false)
}
$dhcpdv6conf = <<<EOD
option domain-name "{$syscfg['domain']}";
option ldap-server code 95 = text;
option domain-search-list code 119 = text;
{$custoptionsv6}
@ -1128,8 +1128,6 @@ EOD;
$dnscfgv6 = "";
if (!empty($dhcpv6ifconf['domain'])) {
$dnscfgv6 .= " option domain-name \"{$dhcpv6ifconf['domain']}\";\n";
} else {
$dnscfgv6 .= " option domain-name \"{$syscfg['domain']}\";\n";
}
if (!empty($dhcpv6ifconf['domainsearchlist'])) {