From 7f19ec0c7368d4fd87b4187a92a313654b8d2c93 Mon Sep 17 00:00:00 2001 From: teastep Date: Mon, 9 Feb 2004 20:46:22 +0000 Subject: [PATCH] Fix another masq file bug git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@1131 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb --- Shorewall/changelog.txt | 4 +++- Shorewall/firewall | 2 +- Shorewall/releasenotes.txt | 6 ++++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Shorewall/changelog.txt b/Shorewall/changelog.txt index 8e878d095..93351deed 100755 --- a/Shorewall/changelog.txt +++ b/Shorewall/changelog.txt @@ -24,4 +24,6 @@ Changes since 1.4.9 11) Fix the enhancement in 1) above to avoid startup errors. -12) Allow maclist with Atheros cards \ No newline at end of file +12) Allow maclist with Atheros cards + +13) Fix masq file problem with exclusion in the source column. diff --git a/Shorewall/firewall b/Shorewall/firewall index cf40afa94..b609e0dff 100755 --- a/Shorewall/firewall +++ b/Shorewall/firewall @@ -3879,7 +3879,7 @@ setup_masq() chain=$newchain destnets=0.0.0.0/0 - if [ -n "$nonmasq" ]; then + if [ -n "$nomasq" ]; then for addr in `separate_list $nomasq`; do addnatrule $chain -s $addr -j RETURN done diff --git a/Shorewall/releasenotes.txt b/Shorewall/releasenotes.txt index 0e773dfca..dc3dead77 100755 --- a/Shorewall/releasenotes.txt +++ b/Shorewall/releasenotes.txt @@ -25,6 +25,12 @@ Problems Corrected since version 1.4.9: 7. Atheros WiFi cards were previously excluded from use with the "maclist" interface option. +8. (Fix from Steven Jan Springl) In the /etc/shorewall/masq entry + + eth0:!10.1.1.150  0.0.0.0/0!10.1.0.0/16     10.1.2.16 + + the !10.1.0.0/16 is ignored. + Migration Issues: None.