extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-06-19 08:07:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix exclude zone processing in DNAT and REDIRECT rules

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@654 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2003-07-14 16:20:45 +00:00
parent e3033694c9
commit 5b03f63961
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Shorewall/changelog.txt
View File

@ -41,3 +41,7 @@ Changes since 1.4.5
17. Make ip_range() smarter. 17. Make ip_range() smarter.
18. Added /sbin/shorewall iprange command. 18. Added /sbin/shorewall iprange command.
19. Fixed handling of excluded zone processing in DNAT and REDIRECT
rules (re-added the protocol to the rule). Fixed parsing of exclude
zones.

10
Shorewall/firewall
View File

@ -1897,7 +1897,7 @@ add_nat_rule() {
log_rule $loglevel $chain $logtarget -t nat log_rule $loglevel $chain $logtarget -t nat
fi fi
addnatrule $chain -j $target1 addnatrule $chain $proto -j $target1
else else
for adr in `separate_list $addr`; do for adr in `separate_list $addr`; do
run_iptables2 -t nat -A OUTPUT $proto $sports -d $adr \ run_iptables2 -t nat -A OUTPUT $proto $sports -d $adr \
@ -1930,7 +1930,7 @@ add_nat_rule() {
log_rule $loglevel $chain $logtarget -t nat -d `fix_bang $adr` log_rule $loglevel $chain $logtarget -t nat -d `fix_bang $adr`
fi fi
addnatrule $chain -d $adr -j $target1 addnatrule $chain $proto -d $adr -j $target1
done done
else else
for adr in `separate_list $addr`; do for adr in `separate_list $addr`; do
@ -2277,11 +2277,11 @@ process_rule() # $1 = target
fatal_error "Empty source zone or qualifier: rule \"$rule\"" fatal_error "Empty source zone or qualifier: rule \"$rule\""
fi fi
if [ "$clientzone" = "${clientzone%\!*}" ]; then if [ "$clientzone" = "${clientzone%!*}" ]; then
excludezones= excludezones=
else else
excludezones="${clientzone#*\!}" excludezones="${clientzone#*!}"
clientzone="${clientzone%\!*}" clientzone="${clientzone%!*}"
[ "$logtarget" = DNAT ] || [ "$logtarget" = REDIRECT ] ||\ [ "$logtarget" = DNAT ] || [ "$logtarget" = REDIRECT ] ||\
fatal_error "Exclude list only allowed with DNAT or REDIRECT" fatal_error "Exclude list only allowed with DNAT or REDIRECT"

3
Shorewall/releasenotes.txt
View File

@ -14,6 +14,9 @@ Problems Corrected:
3) Corrected a problem in Beta 1 where DNS names containing a "-" were 3) Corrected a problem in Beta 1 where DNS names containing a "-" were
mis-handled when they appeared in the DEST column of a rule. mis-handled when they appeared in the DEST column of a rule.
4) The handling of z1!z2 in the SOURCE column of DNAT and REDIRECT
rules has been corrected.
Migration Issues: Migration Issues:
1) In earlier versions, an undocumented feature allowed entries in 1) In earlier versions, an undocumented feature allowed entries in