From d6f9e85c5f7a21a39b27cad212c98d63138c95f2 Mon Sep 17 00:00:00 2001 From: teastep Date: Mon, 19 Mar 2007 03:57:58 +0000 Subject: [PATCH] Fix a couple of bugs git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@5573 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb --- New/Shorewall/Rules.pm | 2 +- New/Shorewall/Tc.pm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/New/Shorewall/Rules.pm b/New/Shorewall/Rules.pm index f0ef41820..41b8a051b 100644 --- a/New/Shorewall/Rules.pm +++ b/New/Shorewall/Rules.pm @@ -552,7 +552,7 @@ sub setup_mac_lists( $ ) { my $maclist_hosts = find_hosts_by_option 'maclist'; - for my $hostref ( $maclist_hosts ) { + for my $hostref ( @$maclist_hosts ) { $maclist_interfaces{ $hostref->[0][0] } = 1; } diff --git a/New/Shorewall/Tc.pm b/New/Shorewall/Tc.pm index 6270f5f11..87a0c6928 100644 --- a/New/Shorewall/Tc.pm +++ b/New/Shorewall/Tc.pm @@ -194,7 +194,7 @@ sub process_tc_rule( $$$$$$$$$$ ) { validate_mark $mark; fatal_error 'Marks < 256 may not be set in the PREROUTING chain when HIGH_ROUTE_MARKS=Yes' - if $cmd || $chain eq 'tcpre' || numeric_value( $cmd ) <= 0xFF || $config{HIGH_ROUTE_MARKS}; + if $cmd && $chain eq 'tcpre' && numeric_value( $cmd ) < 0xFF && $config{HIGH_ROUTE_MARKS}; } expand_rule