michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-02-03 14:13:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix parsing of multi-line rules

Browse Source
This commit is contained in:
Jamie Cameron
2018-04-24 22:22:10 -07:00
parent 946a11c080
commit 99bbc180eb
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
firewalld/firewalld-lib.pl
View File

@@ -39,20 +39,27 @@ if ($?) {
&error("Failed to list zones : $out");
}
my $default_zone = backquote_command(
"$config{'firewall_cmd'} --get-default-zone</dev/null 2>&1");
"$config{'firewall_cmd'} --get-default-zone </dev/null 2>&1");
chomp($default_zone);
my $zone;
my $lo;
foreach my $l (split(/\r?\n/, $out)) {
if ($l =~ /^(\S+)(\s+\(.*\))?/) {
# New zone
$zone = { 'name' => $1,
'default' => $default_zone eq $1 ? 1 : 0 };
$lo = undef;
push(@rv, $zone);
}
elsif ($l =~ /^\s+(\S+):\s*(.*)/ && $zone) {
elsif ($l =~ /^ (\S+):\s*(.*)/ && $zone) {
# Option in some zone
$lo = $1;
$zone->{$1} = [ split(/\s+/, $2) ];
}
elsif ($l =~ /^\t(\S.*)/ && $zone && $lo) {
# Continued option
push(@{$zone->{$lo}}, split(/\s+/, $1));
}
}
return @rv;
}