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

DHCPDv4: hostname validation should include domain. closes https://github.com/opnsense/core/issues/4544

Browse Source
This commit is contained in:
Ad Schellevis 2020-12-23 14:33:24 +01:00
parent e686331888
commit 51c04e7abf
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/www/services_dhcp_edit.php
View File

@ -125,11 +125,24 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
}
/* check for overlaps */
if (!empty($pconfig['domain'])) {
$this_fqdn = $pconfig['hostname'] . "." . $pconfig['domain'];
} else {
$this_fqdn = $pconfig['hostname'] . "." . $config['system']['domain'];
}
foreach ($a_maps as $mapent) {
if (isset($id) && ($a_maps[$id] === $mapent)) {
continue;
}
if ((($mapent['hostname'] == $pconfig['hostname']) && $mapent['hostname']) ||
if (empty($mapent['hostname'])) {
$fqdn = "";
} elseif (!empty($mapent['domain'])) {
$fqdn = $mapent['hostname'] . "." . $mapent['domain'];
} else {
$fqdn = $mapent['hostname'] . "." . $config['system']['domain'];
}
if (($fqdn == $this_fqdn) ||
(($mapent['mac'] == $pconfig['mac']) && $mapent['mac']) ||
(($mapent['ipaddr'] == $pconfig['ipaddr']) && $mapent['ipaddr'] ) ||
(($mapent['cid'] == $pconfig['cid']) && $mapent['cid'])) {