Revision 610cbfdc
Added by Viktor Gurov about 5 years ago
| src/etc/inc/services.inc | ||
|---|---|---|
| 1543 | 1543 |
|
| 1544 | 1544 |
if ($dhcpv6ifconf['dhcp6c-dns'] != 'disabled') {
|
| 1545 | 1545 |
if (is_array($dhcpv6ifconf['dnsserver']) && ($dhcpv6ifconf['dnsserver'][0])) {
|
| 1546 |
$dnscfgv6 .= " option dhcp6.name-servers " . join(",", $dhcpv6ifconf['dnsserver']) . ";";
|
|
| 1546 |
$dnscfgv6 .= " option dhcp6.name-servers " . join(",", $dhcpv6ifconf['dnsserver']) . ";\n";
|
|
| 1547 | 1547 |
} else if (((isset($config['dnsmasq']['enable'])) || isset($config['unbound']['enable'])) && (is_ipaddrv6($ifcfgipv6))) {
|
| 1548 |
$dnscfgv6 .= " option dhcp6.name-servers {$ifcfgipv6};";
|
|
| 1548 |
$dnscfgv6 .= " option dhcp6.name-servers {$ifcfgipv6};\n";
|
|
| 1549 | 1549 |
} else if (is_array($syscfg['dnsserver']) && ($syscfg['dnsserver'][0])) {
|
| 1550 | 1550 |
$dns_arrv6 = array(); |
| 1551 | 1551 |
foreach ($syscfg['dnsserver'] as $dnsserver) {
|
| ... | ... | |
| 1554 | 1554 |
} |
| 1555 | 1555 |
} |
| 1556 | 1556 |
if (!empty($dns_arrv6)) {
|
| 1557 |
$dnscfgv6 .= " option dhcp6.name-servers " . join(",", $dns_arrv6) . ";";
|
|
| 1557 |
$dnscfgv6 .= " option dhcp6.name-servers " . join(",", $dns_arrv6) . ";\n";
|
|
| 1558 | 1558 |
} |
| 1559 | 1559 |
} |
| 1560 | 1560 |
} else {
|
| 1561 |
$dnscfgv6 .= " #option dhcp6.name-servers --;"; |
|
| 1561 |
$dnscfgv6 .= " #option dhcp6.name-servers --;\n";
|
|
| 1562 | 1562 |
} |
| 1563 | 1563 |
|
| 1564 | 1564 |
if (!is_ipaddrv6($ifcfgipv6)) {
|
Also available in: Unified diff
DHCPv6 config newline fix. Issue #10675