From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 15 Sep 2025 10:17:01 +0000 (+0200)
Subject: ovpnmain.cgi: Never write ncp-disable
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d6ec7e0bf08a00c734c9e7b5f7c517ef82029afe;p=people%2Fstevee%2Fipfire-2.x.git

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 2dc4ae18d..fef135aa2 100644
--- 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";
 	}