VladPolskiy/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2025-07-21 23:40:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Support multi-line mappings https://github.com/webmin/webmin/issues/2279

Browse Source
This commit is contained in:
Jamie Cameron
2024-09-14 20:08:23 -07:00
parent 5463547e7a
commit 14d5182b9e
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
postfix/postfix-lib.pl
View File

@ -814,6 +814,7 @@ sub get_maps
&open_readfile(MAPS, $maps_file);
my $i = 0;
my $cmt;
my $lastmap;
while (<MAPS>)
{
s/\r|\n//g; # remove newlines
@ -821,8 +822,8 @@ sub get_maps
# A comment line
$cmt = &is_table_comment($_);
}
elsif (/^\s*(\/[^\/]*\/[a-z]*)\s+(.*)/ ||
/^\s*([^\s]+)\s+(.*)/) {
elsif (/^(\/[^\/]*\/[a-z]*)\s+(.*)/ ||
/^([^\s]+)\s+(.*)/) {
# An actual map
$number++;
my %map;
@ -837,6 +838,12 @@ sub get_maps
$map{'cmt'} = $cmt;
push(@{$maps_cache{$_[0]}}, \%map);
$cmt = undef;
$lastmap = \%map;
}
elsif (/^\s+(\S.*$)/ && $lastmap) {
# Continuation line
$lastmap->{'value'} .= " ".$1;
$lastmap->{'eline'} = $i;
}
else {
$cmt = undef;