diff options
| author | Daniil Baturin <daniil@vyos.io> | 2025-05-21 15:45:52 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-05-21 15:45:52 +0100 |
| commit | bc6e337a13f3021ad39eb064e2452df7df77232f (patch) | |
| tree | 7ed3cd7f631d37c6a81d3ffebd1986cfe92073ac | |
| parent | 60a05334688bf4bd3754eab565e0662f0dd3dec4 (diff) | |
| parent | e12ac5497091ea6a26e7bc689d5ad595c122e957 (diff) | |
| download | vyos-1x-bc6e337a13f3021ad39eb064e2452df7df77232f.tar.gz vyos-1x-bc6e337a13f3021ad39eb064e2452df7df77232f.zip | |
Merge pull request #4521 from natali-rs1985/T7472
ipoe_server: T7472: Add validation for giaddr if dhcp-relay is defined
| -rwxr-xr-x | src/conf_mode/service_ipoe-server.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/conf_mode/service_ipoe-server.py b/src/conf_mode/service_ipoe-server.py index a14d4b5b6..083c27523 100755 --- a/src/conf_mode/service_ipoe-server.py +++ b/src/conf_mode/service_ipoe-server.py @@ -88,6 +88,12 @@ def verify(ipoe): 'Can configure username with Lua script only for RADIUS authentication' ) + if dict_search('external_dhcp.dhcp_relay', iface_config): + if not dict_search('external_dhcp.giaddr', iface_config): + raise ConfigError( + f'"external-dhcp dhcp-relay" requires "giaddr" to be set for interface {interface}' + ) + verify_accel_ppp_authentication(ipoe, local_users=False) verify_accel_ppp_ip_pool(ipoe) verify_accel_ppp_name_servers(ipoe) |