Make INCLUDE work in the zones file

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@590 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2003-06-14 01:22:46 +00:00
parent 4e26bb4ba4
commit 51a7030fdb
3 changed files with 16 additions and 16 deletions

View File

@ -8,6 +8,8 @@ Changes since 1.4.4b
rule will take effect only if the original destination address in rule will take effect only if the original destination address in
the connection request does not match any of the addresses listed. the connection request does not match any of the addresses listed.
3) Enhanced processing of the zones file to allow the INCLUDE
directive.

View File

@ -90,22 +90,17 @@ determine_zones()
multi_display=Multi-zone multi_display=Multi-zone
if [ -f $zonefile ]; then [ -z "$TMP_DIR" ] && TMP_DIR=/tmp
zones=`find_zones $zonefile` strip_file zones $zonefile
zones=`echo $zones` # Remove extra trash zones=`find_zones $TMP_DIR/zones`
zones=`echo $zones` # Remove extra trash
for zone in $zones; do
dsply=`find_display $zone $zonefile` for zone in $zones; do
eval ${zone}_display=\$dsply dsply=`find_display $zone $TMP_DIR/zones`
done eval ${zone}_display=\$dsply
else done
zones="net local dmz gw"
net_display=Net
local_display=Local
dmz_display=DMZ
gw_display=Gateway
fi
rm -f $TMP_DIR/zones
} }
# #

View File

@ -5,6 +5,9 @@ Problems Corrected:
1) The command "shorewall debug try <directory>" now correctly traces 1) The command "shorewall debug try <directory>" now correctly traces
the attempt. the attempt.
2) The INCLUDE directive now works properly in the zones file;
previously, INCLUDE in that file was ignored.
New Features: New Features:
1) The ORIGINAL DEST column in a DNAT[-] or REDIRECT[-] rule may now 1) The ORIGINAL DEST column in a DNAT[-] or REDIRECT[-] rule may now