forked from extern/shorewall_code
Tweak the comma-separated list parsing fix
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@466 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
parent
f81791505a
commit
5a778540da
@ -4174,6 +4174,8 @@ add_to_zone() # $1 = <interface>[:<hosts>] $2 = zone
|
|||||||
# Normalize the first argument to this function
|
# Normalize the first argument to this function
|
||||||
#
|
#
|
||||||
newhost="$interface:$host"
|
newhost="$interface:$host"
|
||||||
|
|
||||||
|
terminator=fatal_error
|
||||||
#
|
#
|
||||||
# Create a new Zone state file
|
# Create a new Zone state file
|
||||||
#
|
#
|
||||||
@ -4203,18 +4205,6 @@ add_to_zone() # $1 = <interface>[:<hosts>] $2 = zone
|
|||||||
# If the zone passed in the command has a dnat chain then insert a rule in
|
# If the zone passed in the command has a dnat chain then insert a rule in
|
||||||
# the nat table PREROUTING chain to jump to that chain when the source
|
# the nat table PREROUTING chain to jump to that chain when the source
|
||||||
# matches the new host(s)#
|
# matches the new host(s)#
|
||||||
# Setup Intrazone chain if appropriate
|
|
||||||
#
|
|
||||||
setup_intrazone() # $1 = zone
|
|
||||||
{
|
|
||||||
eval hosts=\$${1}_hosts
|
|
||||||
|
|
||||||
if have_interfaces_in_zone_with_option $1 multi; then
|
|
||||||
ensurechain ${1}2${1}
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
#
|
#
|
||||||
chain=${zone}_dnat
|
chain=${zone}_dnat
|
||||||
|
|
||||||
@ -4406,6 +4396,8 @@ delete_from_zone() # $1 = <interface>[:<hosts>] $2 = zone
|
|||||||
while read z hosts; do
|
while read z hosts; do
|
||||||
eval ${z}_hosts=\"$hosts\"
|
eval ${z}_hosts=\"$hosts\"
|
||||||
done < ${STATEDIR}/zones
|
done < ${STATEDIR}/zones
|
||||||
|
|
||||||
|
terminator=fatal_error
|
||||||
#
|
#
|
||||||
# Delete any nat table entries for the host(s)
|
# Delete any nat table entries for the host(s)
|
||||||
#
|
#
|
||||||
|
Loading…
Reference in New Issue
Block a user