Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow root domain as literal dot for DHCPv4 and DHCPv6 #7449

Merged
merged 2 commits into from
May 27, 2024
Merged

Allow root domain as literal dot for DHCPv4 and DHCPv6 #7449

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
797347c
feat: Allow root domain as literal dot for DHCPv4 and DHCPv6.
samip5 May 9, 2024
4bc96b9
Missed one place where it needed to be allowed.
samip5 May 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/www/services_dhcp.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ function reconfigure_dhcpd()
if (!empty($pconfig['domainsearchlist'])) {
$domain_array=preg_split("/[ ;]+/",$pconfig['domainsearchlist']);
foreach ($domain_array as $curdomain) {
if (!is_domain($curdomain)) {
if (!is_domain($curdomain, true)) {
$input_errors[] = gettext("A valid domain search list must be specified.");
break;
}
Expand All @@ -232,7 +232,7 @@ function reconfigure_dhcpd()
if ((!empty($pconfig['ntp1']) && !is_ipaddrv4($pconfig['ntp1'])) || (!empty($pconfig['ntp2']) && !is_ipaddrv4($pconfig['ntp2']))) {
$input_errors[] = gettext("A valid IP address must be specified for the primary/secondary NTP servers.");
}
if (!empty($pconfig['domain']) && !is_domain($pconfig['domain'])) {
if (!empty($pconfig['domain']) && !is_domain($pconfig['domain'], true)) {
$input_errors[] = gettext("A valid domain name must be specified for the DNS domain.");
}
if (!empty($pconfig['tftp']) && !is_ipaddrv4($pconfig['tftp']) && !is_domain($pconfig['tftp']) && !is_URL($pconfig['tftp'])) {
Expand Down
2 changes: 1 addition & 1 deletion src/www/services_dhcp_edit.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@
if (!empty($pconfig['domainsearchlist'])) {
$domain_array=preg_split("/[ ;]+/", $pconfig['domainsearchlist']);
foreach ($domain_array as $curdomain) {
if (!is_domain($curdomain)) {
if (!is_domain($curdomain, true)) {
$input_errors[] = gettext("A valid domain search list must be specified.");
break;
}
Expand Down
2 changes: 1 addition & 1 deletion src/www/services_dhcpv6.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ function reconfigure_dhcpd()
if (!empty($pconfig['domainsearchlist'])) {
$domain_array=preg_split("/[ ;]+/",$pconfig['domainsearchlist']);
foreach ($domain_array as $curdomain) {
if (!is_domain($curdomain)) {
if (!is_domain($curdomain, true)) {
$input_errors[] = gettext("A valid domain search list must be specified.");
break;
}
Expand Down
2 changes: 1 addition & 1 deletion src/www/services_dhcpv6_edit.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
if (!empty($pconfig['domainsearchlist'])) {
$domain_array=preg_split("/[ ;]+/",$pconfig['domainsearchlist']);
foreach ($domain_array as $curdomain) {
if (!is_domain($curdomain)) {
if (!is_domain($curdomain, true)) {
$input_errors[] = gettext("A valid domain search list must be specified.");
break;
}
Expand Down