From 23cb8c338ad3de4ead79dbad79a0195c91862fcc Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Fri, 25 Jun 2021 19:38:50 +0200 Subject: 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. --- src/conf_mode/interfaces-openvpn.py | 6 ------ 1 file changed, 6 deletions(-) (limited to 'src/conf_mode') 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 # -- cgit v1.2.3