Tom Eastep wrote: > > Patch attached. >
And here'a a patch that allows manual chains to appear as a target in Action bodies. -Tom -- Tom Eastep \ Nothing is foolproof to a sufficiently talented fool Shoreline, \ http://shorewall.net Washington USA \ [EMAIL PROTECTED] PGP Public Key \ https://lists.shorewall.net/teastep.pgp.key
Index: Shorewall/Chains.pm
===================================================================
--- Shorewall/Chains.pm (revision 7556)
+++ Shorewall/Chains.pm (working copy)
@@ -44,6 +44,7 @@
MACRO
LOGRULE
NFQ
+ CHAIN
NO_RESTRICT
PREROUTE_RESTRICT
INPUT_RESTRICT
Index: Shorewall/Actions.pm
===================================================================
--- Shorewall/Actions.pm (revision 7555)
+++ Shorewall/Actions.pm (working copy)
@@ -400,7 +400,7 @@
$targettype = 0 unless defined $targettype;
fatal_error "Invalid target ($mtarget)"
- unless ( $targettype == STANDARD ) || ( $mtarget eq 'PARAM' ) || ( $targettype & ( LOGRULE | NFQ ) );
+ unless ( $targettype == STANDARD ) || ( $mtarget eq 'PARAM' ) || ( $targettype & ( LOGRULE | NFQ | CHAIN ) );
}
progress_message " ..End Macro $macrofile";
@@ -418,7 +418,7 @@
my $targettype = $targets{$target};
if ( defined $targettype ) {
- return if ( $targettype == STANDARD ) || ( $targettype == MACRO ) || ( $targettype & ( LOGRULE | NFQ ) );
+ return if ( $targettype == STANDARD ) || ( $targettype == MACRO ) || ( $targettype & ( LOGRULE | NFQ | CHAIN ) );
fatal_error "Invalid TARGET ($target)" if $targettype & STANDARD;
@@ -640,7 +640,7 @@
if ( $action2type & ACTION ) {
$target2 = (find_logactionchain ( $target = $target2 ))->{name};
} else {
- fatal_error "Internal Error" unless $action2type == MACRO || $action2type & ( LOGRULE | NFQ );
+ fatal_error "Internal Error" unless $action2type == MACRO || $action2type & ( LOGRULE | NFQ | CHAIN );
}
}
signature.asc
Description: OpenPGP digital signature
------------------------------------------------------------------------- This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________ Shorewall-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/shorewall-devel
