From ecaae1f6442ebcc457911941061d08e092002271 Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Sun, 15 Mar 2015 10:15:39 -0700 Subject: [PATCH] Improve editing of open numbers Signed-off-by: Tom Eastep --- Shorewall-core/lib.cli | 4 ++-- docs/configuration_file_basics.xml | 15 ++++++++++++--- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/Shorewall-core/lib.cli b/Shorewall-core/lib.cli index 699398406..a3ffea2b4 100644 --- a/Shorewall-core/lib.cli +++ b/Shorewall-core/lib.cli @@ -2117,10 +2117,10 @@ open_close_command() { # close # case $1 in - [0-9]*) + [1-9]|[1-9][0-9]|[1-9][0-9][0-9]*) ;; *) - fatal_error "Invalid Rule Number ($1)" + fatal_error "$1 is not a valid temporary open number" ;; esac diff --git a/docs/configuration_file_basics.xml b/docs/configuration_file_basics.xml index 03b92239f..91d9c44e9 100644 --- a/docs/configuration_file_basics.xml +++ b/docs/configuration_file_basics.xml @@ -174,7 +174,13 @@ /etc/shorewall/start - commands that you - wish to execute at the completion of a shorewall + wish to execute near the completion of a shorewall + start or shorewall restart + + + + /etc/shorewall/started - commands that + you wish to execute after the completion of a shorewall start or shorewall restart @@ -836,8 +842,11 @@ DNAT { source=net dest=loc:10.0.0.1 proto=tcp dport=80 mark=88 }ZONE — The name of a zone declared in /etc/shorewall/zones or /etc/shorewall6/zones. This part is only - available in the rules file (/etc/shorewall/rules - and /etc/shorewall6/rules). + available in the rules file + (/etc/shorewall/rules, + /etc/shorewall/blrules, + /etc/shorewall6/rules and + /etc/shorewall6/blrules).