summaryrefslogtreecommitdiff
path: root/src/conf_mode
diff options
context:
space:
mode:
authorDaniil Baturin <daniil@vyos.io>2024-03-29 02:17:48 +0100
committerGitHub <noreply@github.com>2024-03-29 02:17:48 +0100
commitb593eb5d7fd61bddeddcf300890521c1c1ec4335 (patch)
treefae80d9cac6f2a1f92c38f54bf50e03e3e4eb631 /src/conf_mode
parent5e72a71a9bbbef76bda47e34e911ac1fcc015b01 (diff)
parent7aa188ccc51acf4e86aa3b41cde26a0a8d938510 (diff)
downloadvyos-1x-b593eb5d7fd61bddeddcf300890521c1c1ec4335.tar.gz
vyos-1x-b593eb5d7fd61bddeddcf300890521c1c1ec4335.zip
Merge pull request #3196 from HollyGurza/T4718-sagitta
dhcp-server: T4718: Listen-address is not commited if the IP address is on the interface with a VRF
Diffstat (limited to 'src/conf_mode')
-rwxr-xr-xsrc/conf_mode/service_dhcp-server.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/conf_mode/service_dhcp-server.py b/src/conf_mode/service_dhcp-server.py
index 90056887a..e910ecdf7 100755
--- a/src/conf_mode/service_dhcp-server.py
+++ b/src/conf_mode/service_dhcp-server.py
@@ -280,14 +280,13 @@ def verify(dhcp):
raise ConfigError(f'DHCP failover requires "{tmp}" to be specified!')
for address in (dict_search('listen_address', dhcp) or []):
- if is_addr_assigned(address):
+ if is_addr_assigned(address, include_vrf=True):
listen_ok = True
# no need to probe further networks, we have one that is valid
continue
else:
raise ConfigError(f'listen-address "{address}" not configured on any interface')
-
if not listen_ok:
raise ConfigError('None of the configured subnets have an appropriate primary IP address on any\n'
'broadcast interface configured, nor was there an explicit listen-address\n'