diff options
| author | Christian Poessinger <christian@poessinger.com> | 2020-04-10 19:43:38 +0200 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2020-04-11 11:25:13 +0200 |
| commit | a533ca621567150732b58fc5176cd18b608f1f92 (patch) | |
| tree | 08f8d935e5886330e9d37fccb6297faf0267345a /src/conf_mode/vpn_l2tp.py | |
| parent | 6a2e75dbe4003c6987c6932296e68c486ff7b380 (diff) | |
| download | vyos-1x-a533ca621567150732b58fc5176cd18b608f1f92.tar.gz vyos-1x-a533ca621567150732b58fc5176cd18b608f1f92.zip | |
vpn: l2tp: T2264: combine WINS CLI syntax
There is no reason to distinguish between WINS servers in terms of priority.
This is solely a task which can be done in the underlaying Python scripts.
Diffstat (limited to 'src/conf_mode/vpn_l2tp.py')
| -rwxr-xr-x | src/conf_mode/vpn_l2tp.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/conf_mode/vpn_l2tp.py b/src/conf_mode/vpn_l2tp.py index 93ee9edf9..fb7297928 100755 --- a/src/conf_mode/vpn_l2tp.py +++ b/src/conf_mode/vpn_l2tp.py @@ -106,11 +106,8 @@ def get_config(): else: config_data['dnsv6'].append(name_server) - if c.exists('wins-servers server-1'): - config_data['wins'].append(c.return_value('wins-servers server-1')) - - if c.exists('wins-servers server-2'): - config_data['wins'].append(c.return_value('wins-servers server-2')) + if c.exists(['wins-server']): + config_data['wins'] = c.return_values(['wins-server']) if c.exists('outside-address'): config_data['outside_addr'] = c.return_value('outside-address') @@ -326,6 +323,9 @@ def verify(c): raise ConfigError( "\"set vpn l2tp remote-access client-ipv6-pool prefix\" required for delegate-prefix ") + if len(c['wins']) > 2: + raise ConfigError('Not more then two IPv4 WINS name-servers can be configured') + if len(c['dnsv4']) > 2: raise ConfigError('Not more then two IPv4 DNS name-servers can be configured') |