extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-02-08 22:11:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix macro handling of SOURCE and DEST columns

Browse Source
This commit is contained in:
Tom Eastep 2009-12-08 13:28:06 -08:00
parent 79ce532b69
commit 3214b14197
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,7 +3,7 @@
# #
# This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt] # This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt]
# #
# (c) 2007,2008 - Tom Eastep (teastep@shorewall.net) # (c) 2007,2008,2009 - Tom Eastep (teastep@shorewall.net)
# #
# Complete documentation is available at http://shorewall.net # Complete documentation is available at http://shorewall.net
# #
@ -213,7 +213,7 @@ sub merge_macro_source_dest( $$ ) {
if ( $invocation ) { if ( $invocation ) {
if ( $body ) { if ( $body ) {
return $body if $invocation eq '-'; return $body if $invocation eq '-';
return "$body:$invocation" if $invocation =~ /.*?\.*?\.|^\+|^~|^!~/; return "$body:$invocation" if $invocation =~ /.*?\.*?\.|^\+|^!+|^~|^!~|~</;
return "$invocation:$body"; return "$invocation:$body";
} }