From f25adff8fa87d7a9ffd96105578a8732d7c04852 Mon Sep 17 00:00:00 2001 From: Ad Schellevis Date: Mon, 4 Mar 2024 15:20:01 +0100 Subject: [PATCH] Services: ISC DHCPv4: Relay - do not add interfaces for virtual types. missed a spot in previous --- src/etc/inc/plugins.inc.d/dhcpd.inc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/etc/inc/plugins.inc.d/dhcpd.inc b/src/etc/inc/plugins.inc.d/dhcpd.inc index c6aea0797..fd3111cbd 100644 --- a/src/etc/inc/plugins.inc.d/dhcpd.inc +++ b/src/etc/inc/plugins.inc.d/dhcpd.inc @@ -1634,7 +1634,6 @@ function dhcpd_dhcrelay4_configure($verbose = false) } service_log('Starting DHCPv4 relay...', $verbose); - $ifdetails = legacy_interfaces_details(); killbypid('/var/run/dhcrelay.pid'); @@ -1710,8 +1709,8 @@ function dhcpd_dhcrelay4_configure($verbose = false) } } - if (!empty($destif) && isset($ifdetails[$destif]) && $ifdetails[$destif]['macaddr'] == '00:00:00:00:00:00') { - /* explicit skip when interface has no mac address */ + if (!empty($destif) && isset($ifconfig_details[$destif]) && $ifconfig_details[$destif]['macaddr'] == '00:00:00:00:00:00') { + /* explicit skip when interface has no valid mac address */ continue; } elseif (!empty($destif)) { $dhcrelayifs[] = $destif;