holm/shorewall_code
1
0
Fork 0
forked from extern/shorewall_code
Code Pull Requests Activity

change ZONE2ZONE default to '-'.

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2013-11-24 08:16:28 -08:00
parent 3870157898
commit d63262a0cb
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Shorewall/Perl/Shorewall/Config.pm
View File

@ -5567,7 +5567,7 @@ sub get_configuration( $$$$ ) {
if ( supplied ( $val = $config{ZONE2ZONE} ) ) { if ( supplied ( $val = $config{ZONE2ZONE} ) ) {
fatal_error "Invalid ZONE2ZONE value ( $val )" unless $val =~ /^[2-]$/; fatal_error "Invalid ZONE2ZONE value ( $val )" unless $val =~ /^[2-]$/;
} else { } else {
$config{ZONE2ZONE} = '2'; $config{ZONE2ZONE} = '-';
} }
default 'BLACKLIST_DISPOSITION' , 'DROP'; default 'BLACKLIST_DISPOSITION' , 'DROP';

5
Shorewall/manpages/shorewall.conf.xml
View File

@ -2845,8 +2845,9 @@ INLINE - - - ; -j REJECT
<listitem> <listitem>
<para>Added in Shorewall 4.4.4. This option determines how Shorewall <para>Added in Shorewall 4.4.4. This option determines how Shorewall
constructs chain names involving zone names and/or 'all'. The constructs chain names involving zone names and/or 'all'. Beginning
default is '2' (e.g., fw2net).</para> with Shorewall 4.6.0, the default is '-' (e.g., fw-net); prior to
that release, the default was '2' (e.g., fw2net).</para>
</listitem> </listitem>
</varlistentry> </varlistentry>
</variablelist> </variablelist>

5
Shorewall6/manpages/shorewall6.conf.xml
View File

@ -2494,8 +2494,9 @@ INLINE - - - ; -j REJECT
<listitem> <listitem>
<para>Added in Shorewall 4.4.4. This option determines how Shorewall <para>Added in Shorewall 4.4.4. This option determines how Shorewall
constructs chain names involving zone names and/or 'all'. The constructs chain names involving zone names and/or 'all'. Beginning
default is '2' (e.g., fw2net).</para> with Shorewall 4.6.0, the default is '-' (e.g., fw-net); prior to
that release, the default was '2' (e.g., fw2net).</para>
</listitem> </listitem>
</varlistentry> </varlistentry>
</variablelist> </variablelist>