Delete obsolete options from shorewall.conf

Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2010-10-04 07:44:28 -07:00
parent ac8c7ed7d4
commit 38851fe446
8 changed files with 14 additions and 32 deletions

View File

@ -126,18 +126,12 @@ ADMINISABSENTMINDED=Yes
BLACKLISTNEWONLY=Yes
DELAYBLACKLISTLOAD=No
MODULE_SUFFIX=ko
DISABLE_IPV6=No
BRIDGING=No
DYNAMIC_ZONES=No
PKTTYPE=Yes
NULL_ROUTE_RFC1918=No
MACLIST_TABLE=filter

View File

@ -137,14 +137,10 @@ ADMINISABSENTMINDED=Yes
BLACKLISTNEWONLY=Yes
DELAYBLACKLISTLOAD=No
MODULE_SUFFIX=ko
DISABLE_IPV6=No
BRIDGING=No
DYNAMIC_ZONES=No
PKTTYPE=Yes
@ -165,8 +161,6 @@ IMPLICIT_CONTINUE=No
HIGH_ROUTE_MARKS=No
USE_ACTIONS=Yes
OPTIMIZE=1
EXPORTPARAMS=No

View File

@ -137,14 +137,10 @@ ADMINISABSENTMINDED=Yes
BLACKLISTNEWONLY=Yes
DELAYBLACKLISTLOAD=No
MODULE_SUFFIX=ko
DISABLE_IPV6=No
BRIDGING=No
DYNAMIC_ZONES=No
PKTTYPE=Yes
@ -165,8 +161,6 @@ IMPLICIT_CONTINUE=No
HIGH_ROUTE_MARKS=No
USE_ACTIONS=Yes
OPTIMIZE=1
EXPORTPARAMS=No

View File

@ -144,14 +144,10 @@ ADMINISABSENTMINDED=Yes
BLACKLISTNEWONLY=Yes
DELAYBLACKLISTLOAD=No
MODULE_SUFFIX=ko
DISABLE_IPV6=No
BRIDGING=No
DYNAMIC_ZONES=No
PKTTYPE=Yes
@ -172,8 +168,6 @@ IMPLICIT_CONTINUE=No
HIGH_ROUTE_MARKS=No
USE_ACTIONS=Yes
OPTIMIZE=1
EXPORTPARAMS=No

View File

@ -17,6 +17,8 @@ Changes in Shorewall 4.4.14
8) Clamp VERBOSITY to valid range.
9) Delete obsolete options from shorewall.conf.
Changes in Shorewall 4.4.13
1) Allow zone lists in rules SOURCE and DEST.

View File

@ -126,14 +126,10 @@ ADMINISABSENTMINDED=Yes
BLACKLISTNEWONLY=Yes
DELAYBLACKLISTLOAD=No
MODULE_SUFFIX=ko
DISABLE_IPV6=No
BRIDGING=No
DYNAMIC_ZONES=No
PKTTYPE=Yes
@ -154,8 +150,6 @@ IMPLICIT_CONTINUE=No
HIGH_ROUTE_MARKS=No
USE_ACTIONS=Yes
OPTIMIZE=0
EXPORTPARAMS=Yes

View File

@ -62,6 +62,15 @@ VI. PROBLEMS CORRECTED AND NEW FEATURES IN PRIOR RELEASES
7) The log reading commands (show log, logwatch, and dump) returned no
log records when run on one of the -lite products.
8) To avoid future confusion, the following obsolete options have been
deleted from the sample shorewall.conf files:
BRIDGING
DELETEBLACKLISTLOAD
PKTTYPE
They will still be recognized by the rules compiler.
----------------------------------------------------------------------------
I I. K N O W N P R O B L E M S R E M A I N I N G
----------------------------------------------------------------------------

View File

@ -559,8 +559,9 @@ rc-update add bridge boot
<para>In /etc/shorewall/zones, BP zones are specified using the <emphasis
role="bold">bport</emphasis> (or <emphasis role="bold">bport4</emphasis>)
keyword. Shorewall 4.4 or later requires that BRIDGING=No in
<filename>shorewall.conf</filename>.</para>
keyword. If your version of <filename>shorewall.conf</filename> contains
the <emphasis role="bold">BRIDGING</emphasis> option, it must be set to
<emphasis role="bold">No</emphasis>.</para>
<para>In the scenario pictured above, there would probably be two BP zones
defined -- one for the Internet and one for the local LAN so in