From e1535337d4306e10af92fc9084c65eaf7dacf9ec Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Fri, 10 Feb 2006 18:45:05 +0000
Subject: [PATCH] Fix and document 'check -e'

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

diff --git a/Shorewall/changelog.txt b/Shorewall/changelog.txt
index 9d21883a5..0f5d0bc83 100755
--- a/Shorewall/changelog.txt
+++ b/Shorewall/changelog.txt
@@ -59,3 +59,5 @@ Changes in 3.1.x.
 26) Implement bi-directional macros.
 
 27) Fix TC bridge port handling.
+
+28) Fix "check -e"
diff --git a/Shorewall/help b/Shorewall/help
index d8e7d4553..e31079588 100755
--- a/Shorewall/help
+++ b/Shorewall/help
@@ -72,11 +72,15 @@ allow)
 	;;
 
 check)
-	echo "check: check [ <configuration-directory> ]
+	echo "check: check [ -e ] [ <configuration-directory> ]
    Performs a cursory validation of the zones, interfaces, hosts,
    rules, policy, masq, blacklist, proxyarp, nat and provider files.  Use this
    if you are unsure of any edits you have made to the shorewall configuration.
-   See the try command examples for a recommended way to make changes."
+   See the try command examples for a recommended way to make changes.
+
+   The \"-e\" option causes Shorewall to use the /etc/shorewall/capabilities
+   file to determine the capabilities of the target system rather than probing
+   for them on the local system."
 	;;
 
 clear)
diff --git a/Shorewall/releasenotes.txt b/Shorewall/releasenotes.txt
index f77f15048..c6b326358 100755
--- a/Shorewall/releasenotes.txt
+++ b/Shorewall/releasenotes.txt
@@ -68,6 +68,10 @@ Other changes in 3.1.6
     it passes SMB traffic in both directions whereas SMB only
     passes that traffic in one direction.
 
+2)  "shorewall check -e" is now supported and uses the
+    /etc/shorewall/capabilities file to determine the capabilities of
+    the target system.
+
 Migration Considerations:
 
 1)  A number of macros have been split into two.  The macros affected are:
diff --git a/Shorewall/shorewall b/Shorewall/shorewall
index 82fcbd0a3..1a80e70f3 100755
--- a/Shorewall/shorewall
+++ b/Shorewall/shorewall
@@ -753,7 +753,7 @@ check_command() {
 	    ;;
     esac
 
-    export NOROUTES
+    export EXPORT
 
     progress_message3 "Checking..."
 
@@ -1298,7 +1298,7 @@ usage() # $1 = exit status
     echo "where <command> is one of:"
     echo "   add <interface>[:<host-list>] ... <zone>"
     echo "   allow <address> ..."
-    echo "   check [ <directory> ]"
+    echo "   check [ -e ] [ <directory> ]"
     echo "   clear"
     echo "   compile [ -e ] [ -d <distribution> ] [ <directory name> ] <path name>"
     echo "   delete <interface>[:<host-list>] ... <zone>"