diff --git a/Shorewall/help b/Shorewall/help index 1e307e34b..e61ff7cb2 100755 --- a/Shorewall/help +++ b/Shorewall/help @@ -203,12 +203,10 @@ logwatch) ;; refresh) - echo "refresh: [ -q ] refresh + echo "refresh: refresh The rules involving the broadcast addresses of firewall interfaces, the black list, traffic control rules and ECN control rules are recreated to reflect any changes made. Existing connections are untouched. - - If \"-q\" is specified, less detain is displayed making it easier to spot warnings" ;; reject) @@ -226,36 +224,34 @@ reset) ;; restart) - echo "restart: restart [ -q ] [ -n ] [ ] + echo "restart: restart [ -n ] [ ] Restart is the same as a shorewall stop && shorewall start. Existing connections are maintained. - If \"-q\" is specified, less detain is displayed making it easier to spot warnings If \"-n\" is specified, no changes to routing will be made" ;; safe-restart) - echo "safe-restart: [ -q ] safe-restart + echo "safe-restart: safe-restart Restart the same way as a shorewall restart except that previous firewall configuration is backed up and will be restored if you notice any anomalies or you are not able to reach the firewall any more." ;; safe-start) - echo "safe-start: [ -q ] safe-start + echo "safe-start: safe-start Start the same way as a shorewall start except that in case of anomalies shorewall clear is issued. " ;; restore) - echo "restore: restore [ -q ] [ -n ] [ ] + echo "restore: restore [ -n ] [ ] Restore Shorewall to a state saved using the 'save' command Existing connections are maintained. The names a restore file in /var/lib/shorewall created using \"shorewall save\"; if no is given then Shorewall will be restored from the file specified by the RESTOREFILE option in shorewall.conf. - If \"-q\" is specified, less detain is displayed making it easier to spot warnings If \"-n\" is specified, no changes to routing will be made. See also \"help save\", \"help compile\" and \"help forget\"" @@ -305,11 +301,10 @@ show) ;; start) - echo "start: start [ -f ] [ -n ] [ -q ] [ ] + echo "start: start [ -f ] [ -n ] [ ] Start shorewall. Existing connections through shorewall managed interfaces are untouched. New connections will be allowed only if they are allowed by the firewall rules or policies. - If \"-q\" is specified, less detail is displayed making it easier to spot warnings If \"-f\" is specified, the saved configuration specified by the RESTOREFILE option in shorewall.conf will be restored if that saved configuration exists. In that case, a may not be specified. @@ -317,13 +312,11 @@ start) ;; stop) - echo "stop: [ -n ] stop + echo "stop: stop Stops the firewall. All existing connections, except those listed in /etc/shorewall/routestopped, are taken down. The only new traffic permitted through the firewall is from systems listed in /etc/shorewall/routestopped. - - If \"-n\" is specified, no changes to routing will be made" ;; status) @@ -364,7 +357,7 @@ try) the default configuration. The \"-n\" option will be passed down to the underlying commands (see - 'start', 'stop', 'restart' and 'restore')" + 'start', 'restart' and 'restore')" ;; version) diff --git a/Shorewall/releasenotes.txt b/Shorewall/releasenotes.txt index d0e39f0b4..8e5866dc0 100755 --- a/Shorewall/releasenotes.txt +++ b/Shorewall/releasenotes.txt @@ -34,9 +34,11 @@ Problems Corrected in 3.1.5 2) Specifying a GATEWAY IP address in /etc/shorewall/providers no longer causes "shorewall [re]start to fail". -New Features added in 3.1.5 +Other changes in 3.1.5 -None. +1) Synonyms have been removed from the /sbin/shorewall command set. The + 'generate' and 'reload' command have been removed. The 'reload' command + has also been removed from the program generated by 'compile'. Migration Considerations: @@ -193,7 +195,7 @@ file> [ -q ] [ -v ] [ -n ] start [ -q ] [ -v ] [ -n ] stop [ -q ] [ -v ] [ -n ] clear - [ -q ] [ -v ] [ -n ] {restart|reload} + [ -q ] [ -v ] [ -n ] restart [ -q ] [ -v ] [ -n ] status [ -q ] [ -v ] [ -n ] version diff --git a/Shorewall/shorewall b/Shorewall/shorewall index 1276d72e9..6e3e26546 100755 --- a/Shorewall/shorewall +++ b/Shorewall/shorewall @@ -526,22 +526,10 @@ start_command() { finished=1 option= ;; - q*) - VERBOSE=$(($VERBOSE - 1 )) - option=${option#q} - ;; - v*) - VERBOSE=$(($VERBOSE + 1 )) - option=${option#v} - ;; f*) FAST=Yes option=${option#f} ;; - n*) - NOROUTES=Yes - option=${option#n} - ;; *) usage 1 ;; @@ -635,14 +623,6 @@ compile_command() { EXPORT=Yes option=${option#e} ;; - q*) - VERBOSE=$(($VERBOSE - 1 )) - option=${option#q} - ;; - v*) - VERBOSE=$(($VERBOSE + 1 )) - option=${option#v} - ;; -) finished=1 option= @@ -708,13 +688,9 @@ check_command() { finished=1 option= ;; - q*) - VERBOSE=$(($VERBOSE - 1 )) - option=${option#q} - ;; - v*) - VERBOSE=$(($VERBOSE + 1 )) - option=${option#v} + e*) + EXPORT=Yes + option=${option#e} ;; *) usage 1 @@ -774,14 +750,6 @@ restart_command() { finished=1 option= ;; - q*) - VERBOSE=$(($VERBOSE - 1 )) - option=${option#q} - ;; - v*) - VERBOSE=$(($VERBOSE + 1 )) - option=${option#v} - ;; n*) NOROUTES=Yes option=${option#n} @@ -856,6 +824,10 @@ show_command() { VERBOSE=$(($VERBOSE + 1 )) option=${option#v} ;; + x*) + IPT_OPTIONS="-xnv" + option=${option#x} + ;; *) usage 1 ;; @@ -989,9 +961,9 @@ dump_command() { finished=1 option= ;; - v*) - VERBOSE=$(($VERBOSE + 1 )) - option=${option#v} + x*) + IPT_OPTIONS="-xnv" + option=${option#x} ;; *) usage 1 @@ -1109,14 +1081,6 @@ safe_commands() { finished=1 option= ;; - q*) - VERBOSE=$(($VERBOSE - 1 )) - option=${option#q} - ;; - v*) - VERBOSE=$(($VERBOSE + 1 )) - option=${option#v} - ;; n*) NOROUTES=Yes option=${option#n} @@ -1210,14 +1174,6 @@ restore_command() { finished=1 option= ;; - q*) - VERBOSE=$(($VERBOSE + 1 )) - option=${option#q} - ;; - v*) - VERBOSE=$(($VERBOSE + 1 )) - option=${option#v} - ;; n*) NOROUTES=Yes option=${option#n} @@ -1284,7 +1240,7 @@ help() # usage() # $1 = exit status { - echo "Usage: $(basename $0) [debug|trace] [nolock] [ -x ] [ -q ] [ -v ] [ -n ] " + echo "Usage: $(basename $0) [debug|trace] [nolock] [ -q ] [ -v ] " echo "where is one of:" echo " add [:] ... " echo " allow
..." @@ -1293,7 +1249,7 @@ usage() # $1 = exit status echo " compile [ -e ] [ ] " echo " delete [:] ... " echo " drop
..." - echo " dump" + echo " dump [ -x ]" echo " forget [ ]" echo " help [ | host | address ]" echo " hits" @@ -1304,11 +1260,11 @@ usage() # $1 = exit status echo " refresh" echo " reject
..." echo " reset" - echo " restart [ ]" - echo " restore [ ]" + echo " restart [ -n ] [ ]" + echo " restore [ -n ] [ ]" echo " save [ ]" - echo " show [ [ ... ]|actions|capabilities|classifiers|connections|log|macros|mangle|nat|tc|zones]" - echo " start [ -f ] [ ]" + echo " show [ -x ] [ [ ... ]|actions|capabilities|classifiers|connections|log|macros|mangle|nat|tc|zones]" + echo " start [ -f ] [ -n ] [ ]" echo " stop" echo " status" echo " try [ ]"