michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-03-20 08:40:24 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Add description when editing service; change output for multi ports

Browse Source
This commit is contained in:
Ilia
2022-04-10 00:49:22 +03:00
parent 57e71aff37
commit 7994b5e62d
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
firewalld/firewalld-lib.pl
View File

@@ -103,7 +103,7 @@ if (-r $service_file) {
}
@ports = &unique(@ports);
@protos = &unique(@protos);
return {'ports' => join(" $service:", @ports), 'protocols' => uc(join('/', @protos))};
return {'ports' => join(":", @ports), 'protocols' => uc(join('/', @protos))};
}
# list_firewalld_services_with_ports()
@@ -120,7 +120,13 @@ foreach my $s (&list_firewalld_services()) {
push(@rv, [ $s, $s." (".$n[2]." ".uc($n[3]).")" ]);
}
else {
push(@rv, [ $s, $s ]);
my $sportsprotos = &list_firewalld_service_desc($s);
my $sports = $sportsprotos->{'ports'};
my $sprotocols = $sportsprotos->{'protocols'};
my $sdesc;
$sports =~ s/:/, /g;
$sdesc = " ($sports $sprotocols)" if ($sports);
push(@rv, [ $s, "$s$sdesc" ]);
}
}
return @rv;