Fix option handling

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@1228 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2004-03-25 15:28:16 +00:00
parent 0c4062ed67
commit 1596f5362b
4 changed files with 11 additions and 16 deletions

View File

@ -21,3 +21,5 @@ Changes since 2.0.0
10) Add additional options to hosts file 10) Add additional options to hosts file
11) Replace 'subnet' with 'network' in the code 11) Replace 'subnet' with 'network' in the code
12) Fix item 10 above :-(

View File

@ -760,7 +760,7 @@ validate_hosts_file() {
for option in $(separate_list $options) ; do for option in $(separate_list $options) ; do
case $option in case $option in
maclist|-) maclist|routeback|norfc1918|nobogons|blacklist|tcpflags|nosmurfs|newnotsyn|-)
;; ;;
routeback) routeback)
[ -z "$ports" ] && \ [ -z "$ports" ] && \
@ -4736,7 +4736,7 @@ add_common_rules() {
# #
# Bogons # Bogons
# #
hosts="$(find_hosts_by_option bogons)" hosts="$(find_hosts_by_option nobogons)"
if [ -n "$hosts" ]; then if [ -n "$hosts" ]; then
echo "Enabling Bogon Filtering" echo "Enabling Bogon Filtering"

View File

@ -81,7 +81,7 @@
# reserved by RFC 1918 -- see # reserved by RFC 1918 -- see
# 'norfc1918' above). # 'norfc1918' above).
# #
# . . blacklist - This option only makes sense for ports # blacklist - This option only makes sense for ports
# on a bridge. # on a bridge.
# #
# Check packets arriving on this port # Check packets arriving on this port

View File

@ -1,4 +1,4 @@
Shorewall 2.0.1-RC1 Shorewall 2.0.1-RC2
---------------------------------------------------------------------- ----------------------------------------------------------------------
Problems Corrected since 2.0.0 Problems Corrected since 2.0.0
@ -13,19 +13,12 @@ Problems Corrected since 2.0.0
3) Thanks to Sean Mathews, a long-standing problem with Proxy ARP and 3) Thanks to Sean Mathews, a long-standing problem with Proxy ARP and
IPSEC has been corrected. Thanks Sean!!! IPSEC has been corrected. Thanks Sean!!!
Problems Corrected since 2.0.1 Beta 1 Problems Corrected since 2.0.1 RC1
1) The BOGON_LOG_LEVEL variable is now included in shorewall.conf. It 1) Although the release notes listed a set of new options available in
was inadvertently omitted from the Beta 1 file. the /etc/shorewall/hosts file, those options were not accepted.
2) Previously, setting 'norfc1918' also set 'nobogons'; setting 2) The 'nobogons' interface option didn't work.
'nobogons' by itself had no effect.
Problems Corrected since 2.0.1 Beta 2
1) The Default value for ALL INTERFACES in the /etc/shorewall/nat file
is supposed to be 'no' but it remained 'yes' as in 1.4.
----------------------------------------------------------------------- -----------------------------------------------------------------------
Issues when migrating from Shorewall 2.0.0 to Shorewall 2.0.1: Issues when migrating from Shorewall 2.0.0 to Shorewall 2.0.1:
@ -80,7 +73,7 @@ New Features:
4) Shorewall now traps two common zone definition errors: 4) Shorewall now traps two common zone definition errors:
- Including the firewall zone in a /etc/shorewall/hosts record. - Including the firewall zone in a /etc/shorewall/hosts record.
- Defining a interface for a zone in both /etc/shorewall/interfaces - Defining an interface for a zone in both /etc/shorewall/interfaces
and /etc/shorewall/hosts. and /etc/shorewall/hosts.
In the second case, the following will appear during "shorewall In the second case, the following will appear during "shorewall