holm/shorewall_code
1
0
Fork 0
forked from extern/shorewall_code
Code Pull Requests Activity

Don't use ':' as a join character in contatenated macro ACTION expansion.

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2012-11-19 12:58:29 -08:00
parent 47791add99
commit 0d8931e49f
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Shorewall/Macros/macro.NFLOG
View File

@ -10,4 +10,4 @@
# PORT(S) PORT(S) LIMIT GROUP # PORT(S) PORT(S) LIMIT GROUP
FORMAT 2 FORMAT 2
LOG& LOG:&

2
Shorewall/Macros/macro.ULOG
View File

@ -10,4 +10,4 @@
# PORT(S) PORT(S) LIMIT GROUP # PORT(S) PORT(S) LIMIT GROUP
FORMAT 2 FORMAT 2
LOG& LOG:&

4
Shorewall/Perl/Shorewall/Rules.pm
View File

@ -1590,9 +1590,9 @@ sub process_macro ($$$$$$$$$$$$$$$$$$$) {
if ( $mtarget =~ s/&$// ) { if ( $mtarget =~ s/&$// ) {
if ( supplied $param ) { if ( supplied $param ) {
$mtarget = "$mtarget:$macro($param)"; $mtarget = "${mtarget}${macro}($param)";
} else { } else {
$mtarget = "$mtarget:$macro"; $mtarget = "${mtarget}${macro}";
} }
} }