diff --git a/Shorewall-lite/shorewall-lite b/Shorewall-lite/shorewall-lite index f65aae6d8..0c7ac9c20 100755 --- a/Shorewall-lite/shorewall-lite +++ b/Shorewall-lite/shorewall-lite @@ -352,7 +352,8 @@ usage() # $1 = exit status echo "where is one of:" echo " add [:] ... " echo " allow
..." - echo " clear [ -f ]" + echo " clear" + echo " close" echo " delete [:] ... " echo " drop
..." echo " dump [ -x ]" @@ -383,7 +384,7 @@ usage() # $1 = exit status echo " show vardir" echo " show zones" echo " start [ -f ] [ -p ] [ ]" - echo " stop [ -f ]" + echo " stop" echo " status" echo " version [ -a ]" echo @@ -579,7 +580,7 @@ case "$COMMAND" in shift start_command $@ ;; - stop|clear) + stop|close|clear) [ $# -ne 1 ] && usage 1 verify_firewall_script run_it $g_firewall $debugging $nolock $COMMAND diff --git a/Shorewall/shorewall b/Shorewall/shorewall index c6d8b8229..8ec28bd8e 100755 --- a/Shorewall/shorewall +++ b/Shorewall/shorewall @@ -1326,7 +1326,8 @@ usage() # $1 = exit status echo " add [:] ... " echo " allow
..." echo " check [ -e ] [ -r ] [ ]" - echo " clear [ -f ]" + echo " clear" + echo " close" echo " compile [ -e ] [ -d ] [ ] [ ]" echo " delete [:] ... " echo " drop
..." @@ -1369,7 +1370,7 @@ usage() # $1 = exit status echo " show vardir" echo " show zones" echo " start [ -f ] [ -n ] [ -p ] [ ]" - echo " stop [ -f ]" + echo " stop" echo " status" echo " try [ ]" echo " version [ -a ]" @@ -1610,7 +1611,7 @@ case "$COMMAND" in shift start_command $@ ;; - stop|clear) + stop|close|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 89a1d5811..215634ffe 100755 --- a/Shorewall6-lite/shorewall6-lite +++ b/Shorewall6-lite/shorewall6-lite @@ -349,7 +349,8 @@ usage() # $1 = exit status echo "Usage: $(basename $0) [debug|trace] [nolock] [ -q ] [ -v[-1|{0-2}] ] [ -t ] " echo "where is one of:" echo " allow
..." - echo " clear [ -f ]" + echo " clear" + echo " close" echo " drop
..." echo " dump [ -x ]" echo " forget [ ]" @@ -366,7 +367,7 @@ usage() # $1 = exit status echo " save [ ]" echo " show [ -x ] [ -m ] [-f] [ -t {filter|mangle} ] [ {chain [ [ ... ]capabilities|classifiers|config|connections|filters|ip|log []|macros|mangle|nat|policies|raw|routing|tc|vardir|zones} ]" echo " start [ -f ] [ ]" - echo " stop [ -f ]" + echo " stop" echo " status" echo " version [ -a ]" echo @@ -563,7 +564,7 @@ case "$COMMAND" in shift start_command $@ ;; - stop|reset|clear) + stop|close|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 1d61cc0d6..b4a5aebd6 100755 --- a/Shorewall6/shorewall6 +++ b/Shorewall6/shorewall6 @@ -1261,7 +1261,8 @@ usage() # $1 = exit status echo " add [:] ... " echo " allow
..." echo " check [ -e ] [ -r ] [ ]" - echo " clear [ -f ]" + echo " clear" + echo " close" echo " compile [ -e ] [ -d ] [ ] [ ]" echo " delete [:] ... " echo " drop
..." @@ -1284,7 +1285,7 @@ usage() # $1 = exit status echo " save [ ]" echo " show [ -x ] [ -m ] [-f] [ -t {filter|mangle} ] [ {chain [ [ ... ]|actions|capabilities|classifiers|config|connections|filters|ip|log []|macros|mangle|nat|policies|raw|routing|tc|vardir|zones} ]" echo " start [ -f ] [ -n ] [ ]" - echo " stop [ -f ]" + echo " stop" echo " status" echo " try [ ]" echo " version [ -a ]" @@ -1529,7 +1530,7 @@ case "$COMMAND" in shift start_command $@ ;; - stop|clear) + stop|close|clear) [ $# -ne 1 ] && usage 1 get_config [ -x $g_firewall ] || fatal_error "Shorewall6 has never been started"