diff --git a/Shorewall-common/releasenotes.txt b/Shorewall-common/releasenotes.txt index 5d6b6c54b..367989517 100644 --- a/Shorewall-common/releasenotes.txt +++ b/Shorewall-common/releasenotes.txt @@ -62,11 +62,8 @@ Migration Issues. b) Explicitly set LOG_MARTIONS=No to maintain compatibility with prior versions of Shorewall. -5) IMPLICIT_CONTINUE=Yes is now deprecated and a warning message is - issued if you have that setting and nested zones are defined in - /etc/shorewall/shorewall.conf. The warning may be eliminated by - setting IMPLICIT_CONTINUE=No and adding explicit CONTINUE policies - where needed. +5) The value of IMPLICIT_CONTINUE in shorewall.conf (and samples) has + been changed from Yes to No. Problems corrected in 4.1.5. diff --git a/Shorewall-perl/Shorewall/Policy.pm b/Shorewall-perl/Shorewall/Policy.pm index fe0827383..8d7fa4080 100644 --- a/Shorewall-perl/Shorewall/Policy.pm +++ b/Shorewall-perl/Shorewall/Policy.pm @@ -173,8 +173,6 @@ sub validate_policy() my $zone; - my $warned = 0; - for my $option qw/DROP_DEFAULT REJECT_DEFAULT ACCEPT_DEFAULT QUEUE_DEFAULT NFQUEUE_DEFAULT/ { my $action = $config{$option}; next if $action eq 'none'; @@ -198,7 +196,6 @@ sub validate_policy() push @policy_chains, ( new_policy_chain $zone, $zone, 'ACCEPT', OPTIONAL ); if ( $config{IMPLICIT_CONTINUE} && ( @{find_zone( $zone )->{parents}} ) ) { - warning_message "IMPLICT_CONTINUE=Yes is deprecated" unless $warned++; for my $zone1 ( all_zones ) { unless( $zone eq $zone1 ) { add_or_modify_policy_chain( $zone, $zone1 ); diff --git a/Shorewall-shell/compiler b/Shorewall-shell/compiler index 131197418..2dbabbbd2 100755 --- a/Shorewall-shell/compiler +++ b/Shorewall-shell/compiler @@ -481,8 +481,6 @@ validate_policy() ALL_POLICY_CHAINS= - warned= - for zone in $ZONES $FW; do chain=${zone}2${zone} eval ${chain}_is_policy=Yes @@ -494,7 +492,6 @@ validate_policy() if [ -n "$IMPLICIT_CONTINUE" ]; then eval parents=\$${zone}_parents if [ -n "$parents" ]; then - [ -z "$warned" ] && error_message "WARNING: IMPLICIT_CONTINUE=Yes is deprecated" && warned=Yes for zone1 in $ZONES $FW; do if [ $zone != $zone1 ]; then chain=${zone}2${zone1}