Merge branch '4.4.13'

Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2010-09-18 09:29:50 -07:00
commit f7db24f756

View File

@ -3684,9 +3684,12 @@ sub expand_rule( $$$$$$$$$$;$ )
# the associated interface chain # the associated interface chain
# #
sub promote_blacklist_rules() { sub promote_blacklist_rules() {
my $promoted = 1;
my $chainbref = $filter_table->{blacklst}; my $chainbref = $filter_table->{blacklst};
return 1 unless $chainbref;
my $promoted = 1;
while ( $promoted ) { while ( $promoted ) {
$promoted = 0; $promoted = 0;