[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 87d7fa42e36d11e0f3c9920abb41db7740b849db

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 87d7fa42e36d11e0f3c9920abb41db7740b849db

[Michael Tremer]

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, next has been updated
       via  87d7fa42e36d11e0f3c9920abb41db7740b849db (commit)
       via  d6ec7e0bf08a00c734c9e7b5f7c517ef82029afe (commit)
      from  bed0f29daf89b5813137d6e4b0656f690ae392c5 (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 87d7fa42e36d11e0f3c9920abb41db7740b849db
Merge: bed0f29da d6ec7e0bf
Author: Michael Tremer <michael.tremer@ipfire.org>
Date:   Mon Sep 15 10:20:35 2025 +0000

    Merge branch 'master' into next

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

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