diff --git a/Shorewall/changelog.txt b/Shorewall/changelog.txt index a6adb969b..1f960d729 100755 --- a/Shorewall/changelog.txt +++ b/Shorewall/changelog.txt @@ -1,6 +1,6 @@ Changes in 3.0.0 RC 3. -1) ROUTE target removed from capabilities. +1) ROUTE target and Extended Mark removed from capabilities. Changes in 3.0.0 RC 2. diff --git a/Shorewall/functions b/Shorewall/functions index 51df1213d..1d826415f 100755 --- a/Shorewall/functions +++ b/Shorewall/functions @@ -893,7 +893,6 @@ determine_capabilities() { RECENT_MATCH= OWNER_MATCH= IPSET_MATCH= - XMARK= CONNMARK= CONNMARK_MATCH= RAW_TABLE= @@ -913,7 +912,6 @@ determine_capabilities() { qt $IPTABLES -A fooX1234 -p tcp -m ipp2p --ipp2p -j ACCEPT && IPP2P_MATCH=Yes qt $IPTABLES -t mangle -N fooX1234 - qt $IPTABLES -t mangle -A fooX1234 -j MARK --or-mark 2 && XMARK=Yes qt $IPTABLES -t mangle -A fooX1234 -j CONNMARK --save-mark && CONNMARK=Yes qt $IPTABLES -t mangle -A fooX1234 -j CLASSIFY --set-class 1:1 && CLASSIFY_TARGET=Yes qt $IPTABLES -t mangle -F fooX1234 @@ -963,7 +961,6 @@ report_capabilities() { report_capability "Recent Match" $RECENT_MATCH report_capability "Owner Match" $OWNER_MATCH report_capability "Ipset Match" $IPSET_MATCH - report_capability "Extended MARK Target" $XMARK report_capability "CONNMARK Target" $CONNMARK report_capability "Connmark Match" $CONNMARK_MATCH report_capability "Raw Table" $RAW_TABLE diff --git a/Shorewall/releasenotes.txt b/Shorewall/releasenotes.txt index a80a38ed2..f724afd41 100755 --- a/Shorewall/releasenotes.txt +++ b/Shorewall/releasenotes.txt @@ -3,8 +3,8 @@ Shorewall 3.0.0 RC 3. Problems Corrected in 3.0.0 RC 3: 1) Shorewall no longer has any functionality that is dependent on the - Netfilter ROUTE target so detection and reporting of that target - has been removed. + Netfilter ROUTE target and extended packet marking so detection and + reporting of those capabilities has been removed. Migration Considerations: