re-add 'domain' to dhcpdv6 interface configuration

'domain' was removed in #3824 because it is not used by dhcpdv6. But it is used by unbound and dnsmasq for DNS registration of DHCP static mappings. Just set it to the first entry of the domain search list.
This commit is contained in:
Maurice 2020-02-20 17:39:23 +01:00 committed by GitHub
parent 383a8fe8f1
commit 333c2eb63d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -272,6 +272,11 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
if (!empty($pconfig['ntp2'])) {
$dhcpdconf['ntpserver'][] = $pconfig['ntp2'];
}
// set 'domain' to first entry of 'domainsearchlist'
// (used only for DNS registration of static mappings)
if (!empty($pconfig['domainsearchlist'])) {
$dhcpdconf['domain'] = $domain_array[0];
}
$dhcpdconf['numberoptions'] = $pconfig['numberoptions'];
// copy structures back in
@ -558,7 +563,7 @@ if (isset($config['interfaces'][$if]['dhcpd6track6allowoverride'])) {
<td>
<input name="domainsearchlist" type="text" id="domainsearchlist" value="<?=$pconfig['domainsearchlist'];?>" />
<div class="hidden" data-for="help_for_domainsearchlist">
<?=gettext("The default is to use the domain name of this system as the domain search list option provided by DHCPv6. You may optionally specify one or multiple domain(s) here. Use the semicolon character as separator.");?>
<?=gettext("The default is to use the domain name of this system as the domain search list option provided by DHCPv6. You may optionally specify one or multiple domain(s) here. Use the semicolon character as separator. The first domain in this list will also be used for DNS registration of DHCP static mappings (if enabled).");?>
</div>
</td>
</tr>