diff options
| author | Christian Breunig <christian@breunig.cc> | 2024-02-15 16:18:29 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-15 16:18:29 +0100 |
| commit | eb079e4a49150934dec082861176f5a5213c1206 (patch) | |
| tree | 4d74c32d40d8d25522aeb54600a154517df41c53 /src/conf_mode/vpn_l2tp.py | |
| parent | 697ce8c51c2ae9667a699b3d95e0ffa6b1984328 (diff) | |
| parent | 8eec0b5b062b5f98a865949ac0f2a49d61b81199 (diff) | |
| download | vyos-1x-eb079e4a49150934dec082861176f5a5213c1206.tar.gz vyos-1x-eb079e4a49150934dec082861176f5a5213c1206.zip | |
Merge pull request #3013 from vyos/mergify/bp/sagitta/pr-3004
T6029: Rewritten Accel-PPP services to an identical feature set (backport #3004)
Diffstat (limited to 'src/conf_mode/vpn_l2tp.py')
| -rwxr-xr-x | src/conf_mode/vpn_l2tp.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/conf_mode/vpn_l2tp.py b/src/conf_mode/vpn_l2tp.py index 266381754..04ccbcec3 100755 --- a/src/conf_mode/vpn_l2tp.py +++ b/src/conf_mode/vpn_l2tp.py @@ -24,7 +24,9 @@ from vyos.configdict import get_accel_dict from vyos.template import render from vyos.utils.process import call from vyos.utils.dict import dict_search -from vyos.accel_ppp_util import verify_accel_ppp_base_service +from vyos.accel_ppp_util import verify_accel_ppp_name_servers +from vyos.accel_ppp_util import verify_accel_ppp_wins_servers +from vyos.accel_ppp_util import verify_accel_ppp_authentication from vyos.accel_ppp_util import verify_accel_ppp_ip_pool from vyos.accel_ppp_util import get_pools_in_order from vyos import ConfigError @@ -62,12 +64,10 @@ def verify(l2tp): if not l2tp: return None - verify_accel_ppp_base_service(l2tp) + verify_accel_ppp_authentication(l2tp) 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') + verify_accel_ppp_name_servers(l2tp) + verify_accel_ppp_wins_servers(l2tp) return None |