diff options
| author | Christian Poessinger <christian@poessinger.com> | 2021-06-25 19:38:50 +0200 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2021-06-25 19:41:00 +0200 |
| commit | 23cb8c338ad3de4ead79dbad79a0195c91862fcc (patch) | |
| tree | 1a44b4b60be8adec92df1b71db8d620255a2db18 /src/conf_mode | |
| parent | 150b1760230b6d7be3b7afd479f05e6bc5d861f7 (diff) | |
| download | vyos-1x-23cb8c338ad3de4ead79dbad79a0195c91862fcc.tar.gz vyos-1x-23cb8c338ad3de4ead79dbad79a0195c91862fcc.zip | |
openvpn: T1704: drop deprecated disable-ncp option
(cherry picked from commit 6b7b19c93f90839549dd668116c4da2f38cfdc66)
VyOS 1.3 will ship OpenVPN 2.5.1 and thus it is the perfect timing to still
remove this option before introducing it in a new LTS release.
Diffstat (limited to 'src/conf_mode')
| -rwxr-xr-x | src/conf_mode/interfaces-openvpn.py | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/conf_mode/interfaces-openvpn.py b/src/conf_mode/interfaces-openvpn.py index ee6f05fcd..1c1c844d0 100755 --- a/src/conf_mode/interfaces-openvpn.py +++ b/src/conf_mode/interfaces-openvpn.py @@ -92,12 +92,6 @@ def verify(openvpn): if 'mode' not in openvpn: raise ConfigError('Must specify OpenVPN operation mode!') - # Check if we have disabled ncp and at the same time specified ncp-ciphers - if 'encryption' in openvpn: - if {'disable_ncp', 'ncp_ciphers'} <= set(openvpn.get('encryption')): - raise ConfigError('Can not specify both "encryption disable-ncp" '\ - 'and "encryption ncp-ciphers"') - # # OpenVPN client mode - VERIFY # |