mirror of
https://gitlab.com/shorewall/code.git
synced 2024-12-23 06:38:53 +01:00
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:
parent
4e26bb4ba4
commit
51a7030fdb
@ -8,6 +8,8 @@ Changes since 1.4.4b
|
||||
rule will take effect only if the original destination address in
|
||||
the connection request does not match any of the addresses listed.
|
||||
|
||||
3) Enhanced processing of the zones file to allow the INCLUDE
|
||||
directive.
|
||||
|
||||
|
||||
|
||||
|
@ -90,22 +90,17 @@ determine_zones()
|
||||
|
||||
multi_display=Multi-zone
|
||||
|
||||
if [ -f $zonefile ]; then
|
||||
zones=`find_zones $zonefile`
|
||||
[ -z "$TMP_DIR" ] && TMP_DIR=/tmp
|
||||
strip_file zones $zonefile
|
||||
zones=`find_zones $TMP_DIR/zones`
|
||||
zones=`echo $zones` # Remove extra trash
|
||||
|
||||
for zone in $zones; do
|
||||
dsply=`find_display $zone $zonefile`
|
||||
dsply=`find_display $zone $TMP_DIR/zones`
|
||||
eval ${zone}_display=\$dsply
|
||||
done
|
||||
else
|
||||
zones="net local dmz gw"
|
||||
net_display=Net
|
||||
local_display=Local
|
||||
dmz_display=DMZ
|
||||
gw_display=Gateway
|
||||
fi
|
||||
|
||||
rm -f $TMP_DIR/zones
|
||||
}
|
||||
|
||||
#
|
||||
|
@ -5,6 +5,9 @@ Problems Corrected:
|
||||
1) The command "shorewall debug try <directory>" now correctly traces
|
||||
the attempt.
|
||||
|
||||
2) The INCLUDE directive now works properly in the zones file;
|
||||
previously, INCLUDE in that file was ignored.
|
||||
|
||||
New Features:
|
||||
|
||||
1) The ORIGINAL DEST column in a DNAT[-] or REDIRECT[-] rule may now
|
||||
|
Loading…
Reference in New Issue
Block a user