From c408653289acaa23d3d7f6dd4db6b7353717c533 Mon Sep 17 00:00:00 2001 From: Dominik Derigs Date: Sun, 26 Dec 2021 10:35:00 +0100 Subject: [PATCH] Compare label instead of interface name against dhcp_except and tftp interfaces to extend their scope to interface aliases. The man page does not mention that they are limited to "real" interfaces and stop working once an alias interface is specified (even if valid). Signed-off-by: DL6ER --- src/network.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/network.c b/src/network.c index b930553e..0ac25c05 100644 --- a/src/network.c +++ b/src/network.c @@ -506,7 +506,7 @@ static int iface_allowed(struct iface_param *param, int if_index, char *label, } else for (tmp = daemon->dhcp_except; tmp; tmp = tmp->next) - if (tmp->name && wildcard_match(tmp->name, ifr.ifr_name)) + if (tmp->name && wildcard_match(tmp->name, label)) { tftp_ok = 0; dhcp_ok = 0; @@ -520,7 +520,7 @@ static int iface_allowed(struct iface_param *param, int if_index, char *label, /* dedicated tftp interface list */ tftp_ok = 0; for (tmp = daemon->tftp_interfaces; tmp; tmp = tmp->next) - if (tmp->name && wildcard_match(tmp->name, ifr.ifr_name)) + if (tmp->name && wildcard_match(tmp->name, label)) tftp_ok = 1; } #endif