From 2a870088d8194f755687727441b8203858603732 Mon Sep 17 00:00:00 2001
From: Tom Eastep <teastep@shorewall.net>
Date: Thu, 20 May 2010 14:09:40 -0700
Subject: [PATCH] Remove 'close' from CLI programs

Signed-off-by: Tom Eastep <teastep@shorewall.net>
---
 Shorewall-lite/shorewall-lite   | 3 +--
 Shorewall/shorewall             | 3 +--
 Shorewall6-lite/shorewall6-lite | 3 +--
 Shorewall6/shorewall6           | 3 +--
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/Shorewall-lite/shorewall-lite b/Shorewall-lite/shorewall-lite
index 3e6037af0..050803931 100755
--- a/Shorewall-lite/shorewall-lite
+++ b/Shorewall-lite/shorewall-lite
@@ -353,7 +353,6 @@ usage() # $1 = exit status
     echo "   add <interface>[:<host-list>] ... <zone>"
     echo "   allow <address> ..."
     echo "   clear"
-    echo "   close"
     echo "   delete <interface>[:<host-list>] ... <zone>"
     echo "   drop <address> ..."
     echo "   dump [ -x ]"
@@ -580,7 +579,7 @@ case "$COMMAND" in
 	shift
 	start_command $@
 	;;
-    stop|close|clear)
+    stop|clear)
 	[ $# -ne 1 ] && usage 1
 	verify_firewall_script
 	run_it $g_firewall $debugging $nolock $COMMAND
diff --git a/Shorewall/shorewall b/Shorewall/shorewall
index 650edae77..7cc0f5e42 100755
--- a/Shorewall/shorewall
+++ b/Shorewall/shorewall
@@ -1327,7 +1327,6 @@ usage() # $1 = exit status
     echo "   allow <address> ..."
     echo "   check [ -e ] [ -r ] [ <directory> ]"
     echo "   clear"
-    echo "   close"
     echo "   compile [ -e ] [ -d ] [ <directory name> ] [ <path name> ]"
     echo "   delete <interface>[:<host-list>] ... <zone>"
     echo "   drop <address> ..."
@@ -1611,7 +1610,7 @@ case "$COMMAND" in
 	shift
 	start_command $@
 	;;
-    stop|close|clear)
+    stop|clear)
 	get_config
 	[ $# -ne 1 ] && usage 1
 	[ -x $g_firewall ] || fatal_error "Shorewall has never been started"
diff --git a/Shorewall6-lite/shorewall6-lite b/Shorewall6-lite/shorewall6-lite
index 4cf27d8ba..8aae0f207 100755
--- a/Shorewall6-lite/shorewall6-lite
+++ b/Shorewall6-lite/shorewall6-lite
@@ -350,7 +350,6 @@ usage() # $1 = exit status
     echo "where <command> is one of:"
     echo "   allow <address> ..."
     echo "   clear"
-    echo "   close"
     echo "   drop <address> ..."
     echo "   dump [ -x ]"
     echo "   forget [ <file name> ]"
@@ -564,7 +563,7 @@ case "$COMMAND" in
 	shift
 	start_command $@
 	;;
-    stop|close|reset|clear)
+    stop|reset|clear)
 	[ $# -ne 1 ] && usage 1
 	verify_firewall_script
 	run_it $g_firewall $debugging $nolock $COMMAND
diff --git a/Shorewall6/shorewall6 b/Shorewall6/shorewall6
index 17bf6390f..2d0285f18 100755
--- a/Shorewall6/shorewall6
+++ b/Shorewall6/shorewall6
@@ -1262,7 +1262,6 @@ usage() # $1 = exit status
     echo "   allow <address> ..."
     echo "   check [ -e ] [ -r ] [ <directory> ]"
     echo "   clear"
-    echo "   close"
     echo "   compile [ -e ] [ -d ] [ <directory name> ] [ <path name> ]"
     echo "   delete <interface>[:<host-list>] ... <zone>"
     echo "   drop <address> ..."
@@ -1530,7 +1529,7 @@ case "$COMMAND" in
 	shift
 	start_command $@
 	;;
-    stop|close|clear)
+    stop|clear)
 	[ $# -ne 1 ] && usage 1
 	get_config
 	[ -x $g_firewall ] || fatal_error "Shorewall6 has never been started"