Fix multiple excluded zones problem

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@1182 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2004-03-04 15:42:44 +00:00
parent d711731678
commit a469d0d317
4 changed files with 12 additions and 2 deletions

View File

@ -56,3 +56,5 @@ Changes since 1.4.10
27) Allow backrouting of 'routestopped' devices. 27) Allow backrouting of 'routestopped' devices.
28) Fix the help file. 28) Fix the help file.
29) Correct handling of !z1,z2,... in a DNAT/REDIRECT rule.

View File

@ -2661,7 +2661,7 @@ add_nat_rule() {
addnatrule $(dnat_chain $source) $cli $proto $multiport $sports $dports -d $adr -j $chain addnatrule $(dnat_chain $source) $cli $proto $multiport $sports $dports -d $adr -j $chain
done done
for z in $excludezones; do for z in $(separate_list $excludezones); do
eval hosts=\$${z}_hosts eval hosts=\$${z}_hosts
for host in $hosts; do for host in $hosts; do
addnatrule $chain -s ${host#*:} -j RETURN addnatrule $chain -s ${host#*:} -j RETURN

View File

@ -15,6 +15,10 @@ Problems Corrected since 1.4.10
4) The 'detectnets' and 'routeback' options may now be used together 4) The 'detectnets' and 'routeback' options may now be used together
with the intended effect. with the intended effect.
5) The following syntax previously produced an error:
DNAT z1!z2,z3 z4...
Problems Corrected since RC1 Problems Corrected since RC1
1) After a "shorewall stop", traffic routed back to networks in 1) After a "shorewall stop", traffic routed back to networks in

View File

@ -14,7 +14,11 @@
# indicate that the rule matches all addresses except the address/subnet # indicate that the rule matches all addresses except the address/subnet
# given. Notice that no white space is permitted between "!" and the # given. Notice that no white space is permitted between "!" and the
# address/subnet. # address/subnet.
# #------------------------------------------------------------------------------
# WARNING: If you masquerade or use SNAT from a local system to the internet,
# you cannot use an ACCEPT rule to allow traffic from the internet to
# that system. You *must* use a DNAT rule instead.
#-------------------------------------------------------------------------------#
# Columns are: # Columns are:
# #
# ACTION ACCEPT, DROP, REJECT, DNAT, DNAT-, REDIRECT, CONTINUE, # ACTION ACCEPT, DROP, REJECT, DNAT, DNAT-, REDIRECT, CONTINUE,