mirror of
https://gitlab.com/shorewall/code.git
synced 2025-06-20 17:58:07 +02:00
Remove warning but keep new default value
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@8230 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
parent
e0a9add260
commit
131acd8e1f
@ -62,11 +62,8 @@ Migration Issues.
|
|||||||
b) Explicitly set LOG_MARTIONS=No to maintain compatibility with
|
b) Explicitly set LOG_MARTIONS=No to maintain compatibility with
|
||||||
prior versions of Shorewall.
|
prior versions of Shorewall.
|
||||||
|
|
||||||
5) IMPLICIT_CONTINUE=Yes is now deprecated and a warning message is
|
5) The value of IMPLICIT_CONTINUE in shorewall.conf (and samples) has
|
||||||
issued if you have that setting and nested zones are defined in
|
been changed from Yes to No.
|
||||||
/etc/shorewall/shorewall.conf. The warning may be eliminated by
|
|
||||||
setting IMPLICIT_CONTINUE=No and adding explicit CONTINUE policies
|
|
||||||
where needed.
|
|
||||||
|
|
||||||
Problems corrected in 4.1.5.
|
Problems corrected in 4.1.5.
|
||||||
|
|
||||||
|
@ -173,8 +173,6 @@ sub validate_policy()
|
|||||||
|
|
||||||
my $zone;
|
my $zone;
|
||||||
|
|
||||||
my $warned = 0;
|
|
||||||
|
|
||||||
for my $option qw/DROP_DEFAULT REJECT_DEFAULT ACCEPT_DEFAULT QUEUE_DEFAULT NFQUEUE_DEFAULT/ {
|
for my $option qw/DROP_DEFAULT REJECT_DEFAULT ACCEPT_DEFAULT QUEUE_DEFAULT NFQUEUE_DEFAULT/ {
|
||||||
my $action = $config{$option};
|
my $action = $config{$option};
|
||||||
next if $action eq 'none';
|
next if $action eq 'none';
|
||||||
@ -198,7 +196,6 @@ sub validate_policy()
|
|||||||
push @policy_chains, ( new_policy_chain $zone, $zone, 'ACCEPT', OPTIONAL );
|
push @policy_chains, ( new_policy_chain $zone, $zone, 'ACCEPT', OPTIONAL );
|
||||||
|
|
||||||
if ( $config{IMPLICIT_CONTINUE} && ( @{find_zone( $zone )->{parents}} ) ) {
|
if ( $config{IMPLICIT_CONTINUE} && ( @{find_zone( $zone )->{parents}} ) ) {
|
||||||
warning_message "IMPLICT_CONTINUE=Yes is deprecated" unless $warned++;
|
|
||||||
for my $zone1 ( all_zones ) {
|
for my $zone1 ( all_zones ) {
|
||||||
unless( $zone eq $zone1 ) {
|
unless( $zone eq $zone1 ) {
|
||||||
add_or_modify_policy_chain( $zone, $zone1 );
|
add_or_modify_policy_chain( $zone, $zone1 );
|
||||||
|
@ -481,8 +481,6 @@ validate_policy()
|
|||||||
|
|
||||||
ALL_POLICY_CHAINS=
|
ALL_POLICY_CHAINS=
|
||||||
|
|
||||||
warned=
|
|
||||||
|
|
||||||
for zone in $ZONES $FW; do
|
for zone in $ZONES $FW; do
|
||||||
chain=${zone}2${zone}
|
chain=${zone}2${zone}
|
||||||
eval ${chain}_is_policy=Yes
|
eval ${chain}_is_policy=Yes
|
||||||
@ -494,7 +492,6 @@ validate_policy()
|
|||||||
if [ -n "$IMPLICIT_CONTINUE" ]; then
|
if [ -n "$IMPLICIT_CONTINUE" ]; then
|
||||||
eval parents=\$${zone}_parents
|
eval parents=\$${zone}_parents
|
||||||
if [ -n "$parents" ]; then
|
if [ -n "$parents" ]; then
|
||||||
[ -z "$warned" ] && error_message "WARNING: IMPLICIT_CONTINUE=Yes is deprecated" && warned=Yes
|
|
||||||
for zone1 in $ZONES $FW; do
|
for zone1 in $ZONES $FW; do
|
||||||
if [ $zone != $zone1 ]; then
|
if [ $zone != $zone1 ]; then
|
||||||
chain=${zone}2${zone1}
|
chain=${zone}2${zone1}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user