[git.ipfire.org] IPFire 2.x development tree branch, master, updated. d6ec7e0bf08a00c734c9e7b5f7c517ef82029afe

[Michael Tremer <git@ipfire.org>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, master has been updated
       via  d6ec7e0bf08a00c734c9e7b5f7c517ef82029afe (commit)
      from  0088442c56e8a623c25d1a93940eabd29e4d430b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit d6ec7e0bf08a00c734c9e7b5f7c517ef82029afe
Author: Michael Tremer <michael.tremer@ipfire.org>
Date:   Mon Sep 15 12:17:01 2025 +0200

    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>

-----------------------------------------------------------------------

Summary of changes:
 html/cgi-bin/ovpnmain.cgi | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

Difference in files:
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";
 	}
 


hooks/post-receive
--
IPFire 2.x development tree