[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 483a62d97aaf6c874dd0d65c856818178bf687e4

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 483a62d97aaf6c874dd0d65c856818178bf687e4

[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  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 <michael.tremer@ipfire.org>
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 <michael.tremer@ipfire.org>

commit ed9f7ed74b369ccd399013e9c909052e47fa9ca2
Author: Michael Tremer <michael.tremer@ipfire.org>
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 <michael.tremer@ipfire.org>

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

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