From 609dc4d82b6b4fff9b5d48282924c45fbe3b3a62 Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Mon, 24 Oct 2005 22:35:05 +0000
Subject: [PATCH] Remove Extended mark detection and reporting

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@2924 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 Shorewall/changelog.txt    | 2 +-
 Shorewall/functions        | 3 ---
 Shorewall/releasenotes.txt | 4 ++--
 3 files changed, 3 insertions(+), 6 deletions(-)

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: