ovpnmain.cgi: Never write ncp-disable

This was some compatibility code which was supposed to help us with the
transition towards NCP. Since we are now on OpenVPN 2.6, this version no
longer supports the "ncp-disable" switch and we cannot write it to the
configuration any more. There should always be a default value for data
ciphers.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
index 2dc4ae18dfe415e683d9d193d2b3007e8c125b62..fef135aa2ea46de61150f7bbde2bc07a8ee3d8c6 100644 (file)
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@ -306,9 +306,7 @@ sub writeserverconf {
     print CONF "status $RW_STATUS 30\n";
 
        # Cryptography
-       if ($vpnsettings{'DATACIPHERS'} eq '') {
-               print CONF "ncp-disable\n";
-       } else {
+       if ($vpnsettings{'DATACIPHERS'} ne '') {
                print CONF "data-ciphers " . $vpnsettings{'DATACIPHERS'} =~ s/\|/:/gr . "\n";
        }