From e1e7ab42c1d28cd6c89cc553ce9f94bc5b6701ac Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Sun, 15 Jul 2012 10:37:56 -0700 Subject: [PATCH] Make 'routefilter' and 'sfilter' mutually exclusive Signed-off-by: Tom Eastep --- Shorewall/Perl/Shorewall/Zones.pm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Shorewall/Perl/Shorewall/Zones.pm b/Shorewall/Perl/Shorewall/Zones.pm index fa6e6974c..a3b0b243b 100644 --- a/Shorewall/Perl/Shorewall/Zones.pm +++ b/Shorewall/Perl/Shorewall/Zones.pm @@ -1169,7 +1169,9 @@ sub process_interface( $$ ) { if ( $options{rpfilter} ) { require_capability( 'RPFILTER_MATCH', q(The 'rpfilter' option), 's' ) ; - fatal_error q(The 'routefilter' and 'rpfilter' options are mutually exclusive) if $options{routefilter}; + fatal_error q(The 'routefilter', 'sfilter' and 'rpfilter' options are mutually exclusive) if $options{routefilter} || @$filterref; + } else { + fatal_error q(The 'routefilter', 'sfilter' and 'rpfilter' options are mutually exclusive) if $options{routefilter} && @$filterref; } if ( supplied( my $ignore = $options{ignore} ) ) {