From e126d432d6aeaf12245bcd45a7934ca059cfa5d4 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Fri, 17 May 2024 10:42:28 +0200 Subject: [PATCH] dnsmasq: stop exposing regdhcpdomain to static entries Unbound doesn't do it either. Eventually we want to get rid of it completely. For now Dnsmasq doesn't support reading DHCP ranges to match the correct domain for dynamic leases. --- src/etc/inc/plugins.inc.d/dnsmasq.inc | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/etc/inc/plugins.inc.d/dnsmasq.inc b/src/etc/inc/plugins.inc.d/dnsmasq.inc index db88427dd..37ef140e9 100644 --- a/src/etc/inc/plugins.inc.d/dnsmasq.inc +++ b/src/etc/inc/plugins.inc.d/dnsmasq.inc @@ -253,12 +253,7 @@ function _dnsmasq_add_host_entries() } if (isset($dnsmasqcfg['regdhcpstatic'])) { - $domain = $config['system']['domain']; - if (!empty($config['dnsmasq']['regdhcpdomain'])) { - $domain = $config['dnsmasq']['regdhcpdomain']; - } - - foreach (plugins_run('static_mapping', [null, true, $domain, legacy_interfaces_details()]) as $map) { + foreach (plugins_run('static_mapping', [null, true, $config['system']['domain'], legacy_interfaces_details()]) as $map) { foreach ($map as $host) { if (empty($host['hostname'])) { /* cannot register without a hostname */