From 80bfbf30dc43a17502ee36afdcdaab790ebd6406 Mon Sep 17 00:00:00 2001 From: Jamie Cameron Date: Sun, 5 Jan 2025 09:45:34 -0800 Subject: [PATCH] Only read one XML file https://github.com/webmin/webmin/issues/2351 --- firewalld/firewalld-lib.pl | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/firewalld/firewalld-lib.pl b/firewalld/firewalld-lib.pl index e8c9f9ad7..6fef8b6d6 100644 --- a/firewalld/firewalld-lib.pl +++ b/firewalld/firewalld-lib.pl @@ -91,8 +91,8 @@ $service =~ s/[^A-Za-z0-9\-]//g; # Check for file in directory containing all services as xml files my @ports; my @protos; -foreach my $services_dir ("/usr/lib/firewalld/services", - "/etc/firewalld/services") { +foreach my $services_dir ("/etc/firewalld/services", + "/usr/lib/firewalld/services") { my $service_file = "$services_dir/$service.xml"; if (-r $service_file) { my $lref = &read_file_lines($service_file, 1); @@ -104,6 +104,7 @@ foreach my $services_dir ("/usr/lib/firewalld/services", push(@protos, $proto) if ($port && $proto); } } + last if (@ports); } } @ports = &unique(@ports);