From a28dac71ec2cce07b5e6ba0263b8ebed5e693fda Mon Sep 17 00:00:00 2001 From: teastep Date: Mon, 6 Jan 2003 14:12:59 +0000 Subject: [PATCH] Update release notes comment -- allow '-' in ORIGINAL DEST column for consistency git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@395 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb --- Shorewall/firewall | 2 ++ Shorewall/releasenotes.txt | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Shorewall/firewall b/Shorewall/firewall index a58d5af65..b008b043d 100755 --- a/Shorewall/firewall +++ b/Shorewall/firewall @@ -2257,6 +2257,8 @@ process_rule() # $1 = target # Convert 1.3 Rule formats to 1.2 format + [ "x$address" = "x-" ] && address= + case $target in DNAT) target=ACCEPT diff --git a/Shorewall/releasenotes.txt b/Shorewall/releasenotes.txt index 6ac6c1a26..2291b2896 100755 --- a/Shorewall/releasenotes.txt +++ b/Shorewall/releasenotes.txt @@ -38,7 +38,7 @@ New features include: traffic control rules during [re]start. This setting is intended for use by people that prefer to configure traffic shaping when the network interfaces come up rather than when the firewall - is started. By setting TC_ENABLED=Yes and CLEAR_TC=No and by - not supplying an /etc/shorewall/tcstart file, your traffic - shaping rules can still use the 'fw' classifier based on packet - marking defined in /etc/shorewall/tcrules. + is started. If that is what you want to do, set TC_ENABLED=Yes and + CLEAR_TC=No and do not supply an /etc/shorewall/tcstart file. That + way, your traffic shaping rules can still use the 'fwmark' + classifier based on packet marking defined in /etc/shorewall/tcrules.