diff options
| author | Christian Breunig <christian@breunig.cc> | 2024-01-17 06:35:51 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-17 06:35:51 +0100 |
| commit | 0afa8dd813195b43f7ac3c9f0c11fdc8dae31668 (patch) | |
| tree | b84cfe5737e6342a993444b64f7e201814dfda79 /src/conf_mode/vpn_l2tp.py | |
| parent | bf08f0f2538b5068ff1a41b51dac832b04a7d4be (diff) | |
| parent | d187803c31175e471397dd4f77040ab56d2e1073 (diff) | |
| download | vyos-1x-0afa8dd813195b43f7ac3c9f0c11fdc8dae31668.tar.gz vyos-1x-0afa8dd813195b43f7ac3c9f0c11fdc8dae31668.zip | |
Merge pull request #2832 from aapostoliuk/T5865-circinus
T5865: Moved ipv6 pools to named ipv6 pools in accel-ppp
Diffstat (limited to 'src/conf_mode/vpn_l2tp.py')
| -rwxr-xr-x | src/conf_mode/vpn_l2tp.py | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/conf_mode/vpn_l2tp.py b/src/conf_mode/vpn_l2tp.py index 1a91951b4..b569ca140 100755 --- a/src/conf_mode/vpn_l2tp.py +++ b/src/conf_mode/vpn_l2tp.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 # -# Copyright (C) 2019-2023 VyOS maintainers and contributors +# Copyright (C) 2019-2024 VyOS maintainers and contributors # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 or later as @@ -70,15 +70,9 @@ def verify(l2tp): if not dict_search('authentication.radius.dynamic_author.key', l2tp): raise ConfigError('DA/CoE server key required!') - if dict_search('authentication.mode', l2tp) in ['local', 'noauth']: - if not dict_search('client_ip_pool', l2tp) and not dict_search('client_ipv6_pool', l2tp): - raise ConfigError( - "L2TP local auth mode requires local client-ip-pool or client-ipv6-pool to be configured!") - if dict_search('client_ip_pool', l2tp) and not dict_search('default_pool', l2tp): - Warning("'default-pool' is not defined") - verify_accel_ppp_ip_pool(l2tp) + if 'wins_server' in l2tp and len(l2tp['wins_server']) > 2: raise ConfigError( 'Not more then two WINS name-servers can be configured') |