lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-14 08:34:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

dhcp: correctly "merge" arrays for #2336

Browse Source 
Looks like this was introduced in 607d8eccd.
This commit is contained in:
Franco Fichtner 2018-05-05 09:43:06 +00:00
parent 0ac2af1c1a
commit 94df5fbe68
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -238,13 +238,13 @@ function services_radvd_configure($blacklist = array())
/* add DNS servers */
$dnslist_tmp = array();
if (isset($dhcpv6ifconf['rasamednsasdhcp6']) && !empty($dhcpv6ifconf['dnsserver'][0])) {
array_merge($dnslist_tmp, $dhcpv6ifconf['dnsserver']);
$dnslist_tmp = $dhcpv6ifconf['dnsserver'];
} elseif (!isset($dhcpv6ifconf['rasamednsasdhcp6']) && !empty($dhcpv6ifconf['radnsserver'][0])) {
array_merge($dnslist_tmp, $dhcpv6ifconf['radnsserver']);
$dnslist_tmp = $dhcpv6ifconf['radnsserver'];
} elseif (isset($config['dnsmasq']['enable']) || isset($config['unbound']['enable'])) {
$dnslist_tmp[] = get_interface_ipv6($realif);
} elseif (!empty($config['system']['dnsserver'][0])) {
array_merge($dnslist_tmp, $config['system']['dnsserver']);
$dnslist_tmp = $config['system']['dnsserver'];
}
$dnslist = array();
foreach($dnslist_tmp as $server) {