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

DHCPDv4: hostname validation should include domain, missed interface domain. ref https://github.com/opnsense/core/issues/4544

Browse Source
This commit is contained in:
Ad Schellevis 2020-12-23 15:00:56 +01:00
parent 51c04e7abf
commit 6c1b8a993e
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/www/services_dhcp_edit.php
View File

@ -127,6 +127,8 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
/* check for overlaps */
if (!empty($pconfig['domain'])) {
$this_fqdn = $pconfig['hostname'] . "." . $pconfig['domain'];
} elseif (!empty($if) && !empty($config['dhcpd'][$if]['domain'])) {
$this_fqdn = $pconfig['hostname'] . "." . $config['dhcpd'][$if]['domain'];
} else {
$this_fqdn = $pconfig['hostname'] . "." . $config['system']['domain'];
}
@ -138,6 +140,8 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
$fqdn = "";
} elseif (!empty($mapent['domain'])) {
$fqdn = $mapent['hostname'] . "." . $mapent['domain'];
} elseif (!empty($if) && !empty($config['dhcpd'][$if]['domain'])) {
$fqdn = $mapent['hostname'] . "." . $config['dhcpd'][$if]['domain'];
} else {
$fqdn = $mapent['hostname'] . "." . $config['system']['domain'];
}