extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2024-12-15 19:01:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix deletion of only rule in a chain

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2010-04-08 17:20:11 -07:00
parent ab1a27ca2a
commit c2c0fb0dd2
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Shorewall/Perl/Shorewall/Chains.pm
View File

@ -626,7 +626,7 @@ sub purge_jump ( $$ ) {
if ( / -[gj] ${to}\b/ ) { if ( / -[gj] ${to}\b/ ) {
trace( $fromref, 'D', $rule, $_ ) if $debug; trace( $fromref, 'D', $rule, $_ ) if $debug;
$_ = undef; $_ = undef;
$deleted = 1 unless $rule == $rules; $deleted = 1 unless $rule == $rules && $rules > 1;
} }
} }
@ -1449,7 +1449,7 @@ sub delete_references( $ ) {
trace( $fromref, 'D', $rule, $_ ) if $debug; trace( $fromref, 'D', $rule, $_ ) if $debug;
$_ = undef; $_ = undef;
$count++; $count++;
$deleted = 1 unless $rule == $rules; $deleted = 1 unless $rule == $rules && $rules > 1;
} }
} }
@ -1686,6 +1686,8 @@ sub optimize_ruleset() {
# #
# Chain has a single rule # Chain has a single rule
# #
assert( $firstrule );
if ( $firstrule =~ /^-A $chainref->{name} -[jg] (.*)$/ ) { if ( $firstrule =~ /^-A $chainref->{name} -[jg] (.*)$/ ) {
# #
# Easy case -- the rule is a simple jump # Easy case -- the rule is a simple jump
@ -3599,7 +3601,7 @@ sub create_netfilter_load( $ ) {
# Then emit the rules # Then emit the rules
# #
for my $chainref ( @chains ) { for my $chainref ( @chains ) {
emitr $_ for ( grep defined $_, @{$chainref->{rules}} ); emitr $_ for @{$chainref->{rules}};
} }
# #
# Commit the changes to the table # Commit the changes to the table
@ -3681,7 +3683,7 @@ sub preview_netfilter_load() {
# Then emit the rules # Then emit the rules
# #
for my $chainref ( @chains ) { for my $chainref ( @chains ) {
emitr1 $_ for ( grep defined $_, @{$chainref->{rules}} ); emitr1 $_ for @{$chainref->{rules}};
} }
# #
# Commit the changes to the table # Commit the changes to the table
@ -3776,7 +3778,7 @@ sub create_chainlist_reload($) {
# #
# Emit the chain rules # Emit the chain rules
# #
emitr $_ for ( grep defined $_, @rules ); emitr $_ for @rules;
} }
# #
# Commit the changes to the table # Commit the changes to the table