diff --git a/Shorewall/Perl/Shorewall/Config.pm b/Shorewall/Perl/Shorewall/Config.pm index 76daab6f2..172f435f1 100644 --- a/Shorewall/Perl/Shorewall/Config.pm +++ b/Shorewall/Perl/Shorewall/Config.pm @@ -5567,7 +5567,7 @@ sub get_configuration( $$$$ ) { if ( supplied ( $val = $config{ZONE2ZONE} ) ) { fatal_error "Invalid ZONE2ZONE value ( $val )" unless $val =~ /^[2-]$/; } else { - $config{ZONE2ZONE} = '2'; + $config{ZONE2ZONE} = '-'; } default 'BLACKLIST_DISPOSITION' , 'DROP'; diff --git a/Shorewall/manpages/shorewall.conf.xml b/Shorewall/manpages/shorewall.conf.xml index 78c13378b..46cdf7275 100644 --- a/Shorewall/manpages/shorewall.conf.xml +++ b/Shorewall/manpages/shorewall.conf.xml @@ -2845,8 +2845,9 @@ INLINE - - - ; -j REJECT Added in Shorewall 4.4.4. This option determines how Shorewall - constructs chain names involving zone names and/or 'all'. The - default is '2' (e.g., fw2net). + constructs chain names involving zone names and/or 'all'. Beginning + with Shorewall 4.6.0, the default is '-' (e.g., fw-net); prior to + that release, the default was '2' (e.g., fw2net). diff --git a/Shorewall6/manpages/shorewall6.conf.xml b/Shorewall6/manpages/shorewall6.conf.xml index 57a51d72f..42b5b53f8 100644 --- a/Shorewall6/manpages/shorewall6.conf.xml +++ b/Shorewall6/manpages/shorewall6.conf.xml @@ -2494,8 +2494,9 @@ INLINE - - - ; -j REJECT Added in Shorewall 4.4.4. This option determines how Shorewall - constructs chain names involving zone names and/or 'all'. The - default is '2' (e.g., fw2net). + constructs chain names involving zone names and/or 'all'. Beginning + with Shorewall 4.6.0, the default is '-' (e.g., fw-net); prior to + that release, the default was '2' (e.g., fw2net).