From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.haj.ipfire.org (localhost [IPv6:::1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4cQLdk1B4qz2yVK for ; Mon, 15 Sep 2025 10:20:42 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [IPv6:2001:678:b28::25]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (Client CN "mail01.haj.ipfire.org", Issuer "R13" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4cQLdk14XXz2xQ9 for ; Mon, 15 Sep 2025 10:20:42 +0000 (UTC) Received: from people01.haj.ipfire.org (people01.haj.ipfire.org [172.28.1.161]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (Client CN "people01.haj.ipfire.org", Issuer "E8" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4cQLdj6Cmrz38g for ; Mon, 15 Sep 2025 10:20:41 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1757931641; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=yNivBTHwLj9gtQM8uHuQaN9wRRJcaFQvmPmrzqVD2LM=; b=WSRVjX/TTUqnp00jubQjCaya4+e9/clQQ9iUB0vFs4VaYa2hgd6oBRUL/uBwirke06fr2p zlO+UnXrMOJQlSAQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1757931641; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=yNivBTHwLj9gtQM8uHuQaN9wRRJcaFQvmPmrzqVD2LM=; b=ViGgoPHBfeU3NOSKkAM4VUnlO26Tb9cy2XGKCPxdzwCxxWhSALBAOaa3PFtNNsR1NZ4hCu /mKppjluEgbrpeSrqGaN/wDzdUZzuVY5tFgcOCwY3mckxSMyadYlGF57ykMTSOg56ctdpN PYNnguLBXBSwa5WpeqnhbYsmLeDyHSwD6b9co5rrRgAyYBUkbHsEyKjDKc1ia6vLNiZeIv au7uGZpDqYmHJe3Ol321+jWpkLIyY//A+cxppoF2lhag0CpxNNz7AUtrto5F76QEln65zg +sNzuLDM5UsJ4Wry9ak8KPpw2vFji4E9/Zh8t/WuP3BxDjzoIHKG38iwgNK6Pw== Received: by people01.haj.ipfire.org (Postfix, from userid 1000) id 4cQLdj5rBhz2xZ2; Mon, 15 Sep 2025 10:20:41 +0000 (UTC) To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 87d7fa42e36d11e0f3c9920abb41db7740b849db X-Git-Refname: refs/heads/next X-Git-Reftype: branch X-Git-Oldrev: bed0f29daf89b5813137d6e4b0656f690ae392c5 X-Git-Newrev: 87d7fa42e36d11e0f3c9920abb41db7740b849db Message-Id: <4cQLdj5rBhz2xZ2@people01.haj.ipfire.org> Date: Mon, 15 Sep 2025 10:20:41 +0000 (UTC) From: Michael Tremer Precedence: list List-Id: List-Subscribe: , List-Unsubscribe: , List-Post: List-Help: Sender: Mail-Followup-To: 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 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