Revision f535d5a0
Added by Seth Mos almost 14 years ago
| etc/inc/services.inc | ||
|---|---|---|
| 119 | 119 |
break; |
| 120 | 120 |
|
| 121 | 121 |
} |
| 122 |
$rtadvdconf .= "\t:tc=ether:\n"; |
|
| 122 |
$rtadvdconf .= "\t:tc=ether:\\\n"; |
|
| 123 |
/* add DNS servers */ |
|
| 124 |
if(!empty($dhcpv6ifconf['dnsserver'][0])) {
|
|
| 125 |
$dnslist = implode(",", $dhcpv6ifconf['dnsserver']);
|
|
| 126 |
$rtadvdconf .= "\t:rdnss=\"{$dnslist}\":\\\n";
|
|
| 127 |
} elseif (isset($config['dnsmasq']['enable'])) {
|
|
| 128 |
$dnslist = get_interface_ipv6($dhcpv6if); |
|
| 129 |
$rtadvdconf .= "\t:rdnss=\"{$dnslist}\":\\\n";
|
|
| 130 |
} elseif (!empty($config['system']['dnsserver'][0])) {
|
|
| 131 |
$dnslist = implode(",", $config['system']['dnsserver']);
|
|
| 132 |
$rtadvdconf .= "\t:rdnss=\"{$dnslist}\":\\\n";
|
|
| 133 |
} |
|
| 134 |
|
|
| 135 |
if($dhcpv6ifconf['domain'] <> "") {
|
|
| 136 |
$rtadvdconf .= "\t:dnssl=\"{$dhcpv6ifconf['domain']}\":\n";
|
|
| 137 |
} elseif ($config['system']['domain'] <> "") {
|
|
| 138 |
$rtadvdconf .= "\t:dnssl=\"{$config['system']['domain']}\":\n";
|
|
| 139 |
} |
|
| 123 | 140 |
$rtadvdconf .= "\n\n"; |
| 124 | 141 |
$rtadvdnum++; |
| 125 | 142 |
} |
Also available in: Unified diff
Now that our rtadvd binary supports RDNSS we can tack the search domain and DNS servers onto the stack.
Ticket #1836