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 4cwJMh18bQz331l for ; Mon, 27 Oct 2025 16:08:32 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (Client CN "mail01.haj.ipfire.org", Issuer "R12" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4cwJMh0vHpz2xQ9 for ; Mon, 27 Oct 2025 16:08:32 +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 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature ECDSA (secp384r1) client-digest SHA384) (Client CN "people01.haj.ipfire.org", Issuer "E8" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4cwJMg4WLzz4h for ; Mon, 27 Oct 2025 16:08:31 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1761581311; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=pZeTzx89iDgrMXWLsEgbvwNvuksBPmkGZi2jvuxtvrU=; b=IOcMqwe3R4qrnnkbf6GCMYKXhdMoE/aYxrS8g82vyy/cGxeGX6/bg3nbiqs8Jb+z1djmZC RLKczOHiMsho8MAA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1761581311; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=pZeTzx89iDgrMXWLsEgbvwNvuksBPmkGZi2jvuxtvrU=; b=iOMgrd6V3h/PEMD/5+3cWsoiDNylcMC25+RvqZR+expehtART/W0CXuKHhCH3JUoeP4doS f6HeyqVA5WiDX/4vN5WLZ0gN1QKUmx4z/RyRd/5cQ3pRdPXTq79fuFBlt4ackzDOHzuVf8 pCcQSxpZNS2rXZhrSqiDIADgfCbjNwQPt4q224Agtz/Ojb2kRQSpCaiiZ9ZCoChxndOx5F xtYrmtg41Qm26Qt0of87zccFEnxXP6PDWrmHuabAkXJ5rTvOZg4QjPWtP8SYoBLB52HPLP rqaStWibwLmlGr9+WqUWlbQifSHTCuFCRLZUdZamsy7iubx98qOcIbJLsj1m6Q== Received: by people01.haj.ipfire.org (Postfix, from userid 1000) id 4cwJMg3BWNz2xSm; Mon, 27 Oct 2025 16:08:31 +0000 (UTC) To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 483a62d97aaf6c874dd0d65c856818178bf687e4 X-Git-Refname: refs/heads/next X-Git-Reftype: branch X-Git-Oldrev: 5fff4e12e51746d65e5ee3621e0a81d471910265 X-Git-Newrev: 483a62d97aaf6c874dd0d65c856818178bf687e4 Message-Id: <4cwJMg3BWNz2xSm@people01.haj.ipfire.org> Date: Mon, 27 Oct 2025 16:08:31 +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 483a62d97aaf6c874dd0d65c856818178bf687e4 (commit) via ed9f7ed74b369ccd399013e9c909052e47fa9ca2 (commit) from 5fff4e12e51746d65e5ee3621e0a81d471910265 (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 483a62d97aaf6c874dd0d65c856818178bf687e4 Author: Michael Tremer Date: Mon Oct 27 17:05:36 2025 +0100 ovpnmain.cgi: Add newline after comment This caused that the first line of the client's custom DHCP/DNS configuration was ignored. Fixes: #13895 - OpenVPN GUI does not apply DNS resolver settings for individual roadwarrrior connections Signed-off-by: Michael Tremer commit ed9f7ed74b369ccd399013e9c909052e47fa9ca2 Author: Michael Tremer Date: Mon Oct 27 16:52:43 2025 +0100 ovpnmain.cgi: Fix pushing all routes If there were multiple client routes configured, the OpenVPN server was only told about the first one. This patch fixes this and also cleans up the code for pushing the server routes, too. Fixes: #13901 - iroute line is only written for the first of the OpenVPN client routes Signed-off-by: Michael Tremer ----------------------------------------------------------------------- Summary of changes: html/cgi-bin/ovpnmain.cgi | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) Difference in files: diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index 1ec327998..3b3776aaa 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -571,7 +571,7 @@ sub get_ccd_client_routes($) { foreach my $key (keys %client_routes) { if ($client_routes{$key}[0] eq $name) { - push(@routes, $client_routes{$key}[1]); + push(@routes, @{$client_routes{$key}}[1 .. $#{$client_routes{$key}}]); } } @@ -589,11 +589,7 @@ sub get_ccd_server_routes($) { foreach my $key (keys %server_routes) { if ($server_routes{$key}[0] eq $name) { - my $i = 1; - - while (my $route = $server_routes{$key}[$i++]) { - push(@routes, $route); - } + push(@routes, @{$server_routes{$key}}[1 .. $#{$server_routes{$key}}]); } } @@ -691,7 +687,7 @@ sub write_ccd_configs() { ), ); - print CONF "# DHCP Options"; + print CONF "# DHCP Options\n"; foreach my $option (keys %options) { foreach (@options{$option}) { hooks/post-receive -- IPFire 2.x development tree