diff --git a/Shorewall2/changelog.txt b/Shorewall2/changelog.txt index f13b8f85a..b142d9deb 100644 --- a/Shorewall2/changelog.txt +++ b/Shorewall2/changelog.txt @@ -4,6 +4,8 @@ Changes in 2.4.0-Final 2) Remove "ipp2p" support in the rules file. +3) Fix duplicate routing table listings from "shorewall status" + Changes in 2.4.0-RC2 1) Relax "detect" restriction. diff --git a/Shorewall2/releasenotes.txt b/Shorewall2/releasenotes.txt index dfe9bf3e5..5a4661316 100755 --- a/Shorewall2/releasenotes.txt +++ b/Shorewall2/releasenotes.txt @@ -1,15 +1,10 @@ -Shorewall 2.4.0-RC2 +Shorewall 2.4.0 ----------------------------------------------------------------------- -Problems Corrected since 2.4.0-RC1 +Problems Corrected since 2.4.0-RC2 -1) The value 'detect' in the GATEWAY column of the providers file - is no longer restricted to P-T-P interfaces. - -2) Previously "shorewall add" would terminate with an error if any of - the listed hosts were already in the specified zone. Now a warning - message is issued and an attempt is made to add the non-duplicate - hosts to the zone (Patch by Tuomo Soini). +1) Previously, "shorewall status" could list the same routing table's + contents more than once. ----------------------------------------------------------------------- Upgrade Issues when moving to 2.4.0 diff --git a/Shorewall2/shorewall b/Shorewall2/shorewall index 9c22f880b..666f61fb7 100755 --- a/Shorewall2/shorewall +++ b/Shorewall2/shorewall @@ -1161,7 +1161,8 @@ case "$1" in echo ip rule ls ip rule ls | while read rule; do - table=${rule##* } + echo ${rule##* } + done | sort -u | while read table; do echo echo "Table $table:" echo