diff options
author | Christian Poessinger <christian@poessinger.com> | 2020-04-22 18:35:24 +0200 |
---|---|---|
committer | Christian Poessinger <christian@poessinger.com> | 2020-04-22 18:35:43 +0200 |
commit | 6f090e918bae878463aa683511ceab4fbbbade54 (patch) | |
tree | cb2f12721f2bf1abc960c5547b5d03cefbb26969 /src/conf_mode | |
parent | fea838d39dfdd0ff8039ce8439a670a4ad45331f (diff) | |
download | vyos-1x-6f090e918bae878463aa683511ceab4fbbbade54.tar.gz vyos-1x-6f090e918bae878463aa683511ceab4fbbbade54.zip |
accel-ppp: fix wrong reference in verify() on missing attributes
Diffstat (limited to 'src/conf_mode')
-rwxr-xr-x | src/conf_mode/service_ipoe-server.py | 4 | ||||
-rwxr-xr-x | src/conf_mode/service_pppoe-server.py | 2 | ||||
-rwxr-xr-x | src/conf_mode/vpn_l2tp.py | 2 | ||||
-rwxr-xr-x | src/conf_mode/vpn_pptp.py | 2 | ||||
-rwxr-xr-x | src/conf_mode/vpn_sstp.py | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/src/conf_mode/service_ipoe-server.py b/src/conf_mode/service_ipoe-server.py index 23a2091bd..17fa2c3f0 100755 --- a/src/conf_mode/service_ipoe-server.py +++ b/src/conf_mode/service_ipoe-server.py @@ -238,7 +238,7 @@ def verify(ipoe): for interface in ipoe['interfaces']: if not interface['range']: - raise ConfigError(f'No IPoE client subnet defined on interface "{{ interface }}"') + raise ConfigError(f'No IPoE client subnet defined on interface "{ interface }"') if len(ipoe['dnsv4']) > 2: raise ConfigError('Not more then two IPv4 DNS name-servers can be configured') @@ -253,7 +253,7 @@ def verify(ipoe): for radius in ipoe['radius_server']: if not radius['key']: server = radius['server'] - raise ConfigError(f'Missing RADIUS secret key for server "{{ server }}"') + raise ConfigError(f'Missing RADIUS secret key for server "{ server }"') if ipoe['client_ipv6_delegate_prefix'] and not ipoe['client_ipv6_pool']: raise ConfigError('IPoE IPv6 deletate-prefix requires IPv6 prefix to be configured!') diff --git a/src/conf_mode/service_pppoe-server.py b/src/conf_mode/service_pppoe-server.py index 066e997f6..95cb066d8 100755 --- a/src/conf_mode/service_pppoe-server.py +++ b/src/conf_mode/service_pppoe-server.py @@ -389,7 +389,7 @@ def verify(pppoe): for radius in pppoe['radius_server']: if not radius['key']: server = radius['server'] - raise ConfigError(f'Missing RADIUS secret key for server "{{ server }}"') + raise ConfigError(f'Missing RADIUS secret key for server "{ server }"') if len(pppoe['wins']) > 2: raise ConfigError('Not more then two IPv4 WINS name-servers can be configured') diff --git a/src/conf_mode/vpn_l2tp.py b/src/conf_mode/vpn_l2tp.py index d8a1fb115..a4ef99d45 100755 --- a/src/conf_mode/vpn_l2tp.py +++ b/src/conf_mode/vpn_l2tp.py @@ -309,7 +309,7 @@ def verify(l2tp): for radius in l2tp['radius_server']: if not radius['key']: - raise ConfigError(f"Missing RADIUS secret for server {{ radius['key'] }}") + raise ConfigError(f"Missing RADIUS secret for server { radius['key'] }") # check for the existence of a client ip pool if not (l2tp['client_ip_pool'] or l2tp['client_ip_subnets']): diff --git a/src/conf_mode/vpn_pptp.py b/src/conf_mode/vpn_pptp.py index a602de412..046fc8f9c 100755 --- a/src/conf_mode/vpn_pptp.py +++ b/src/conf_mode/vpn_pptp.py @@ -234,7 +234,7 @@ def verify(pptp): for radius in pptp['radius_server']: if not radius['key']: server = radius['server'] - raise ConfigError(f'Missing RADIUS secret key for server "{{ server }}"') + raise ConfigError(f'Missing RADIUS secret key for server "{ server }"') if len(pptp['dnsv4']) > 2: raise ConfigError('Not more then two IPv4 DNS name-servers can be configured') diff --git a/src/conf_mode/vpn_sstp.py b/src/conf_mode/vpn_sstp.py index 90b4f1f34..e6ce94709 100755 --- a/src/conf_mode/vpn_sstp.py +++ b/src/conf_mode/vpn_sstp.py @@ -297,7 +297,7 @@ def verify(sstp): for radius in sstp['radius_server']: if not radius['key']: server = radius['server'] - raise ConfigError(f'Missing RADIUS secret key for server "{{ server }}"') + raise ConfigError(f'Missing RADIUS secret key for server "{ server }"') def generate(sstp): if not sstp: |