1) Remove trailing white space.

2) Improve detection of white space in comma-separated lists.
3) Fix a typo in the INSTALL file.


git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@464 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb

Shorewall/INSTALL

@@ -36,7 +36,7 @@ o For other distributions, determine where your distribution installs
   init scripts and type "./install.sh <init script directory>"
 o Start the firewall by typing "shorewall start"
 o If the install script was unable to configure Shoreline Firewall to
-  start audomatically at boot, see the HTML documentation contains in the
+  start automatically at boot, see the HTML documentation contains in the
   "documentation" directory.
 
 Upgrade:

Shorewall/firewall

@@ -1240,6 +1240,8 @@ stop_firewall() {
 
     stopping="Yes"
 
+    terminator=
+
     deletechain shorewall
 
     run_user_exit stop
@@ -3351,6 +3353,8 @@ initialize_netfilter () {
     strip_file maclist
     strip_file nat
 
+    terminator=fatal_error
+
     deletechain shorewall
 
     [ -n "$NAT_ENABLED" ] && delete_nat
@@ -4505,6 +4509,10 @@ do_initialize() {
 
     PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin
     #
+    # Establish termination function
+    #
+    terminator=startup_error
+    #
     # Clear all configuration variables
     #
     version=

Shorewall/functions

@@ -29,6 +29,21 @@ separate_list() {
     local list
     local part
     local newlist
+    #
+    # There's been whining about us not catching embedded white space in
+    # comma-separated lists. This is an attempt to snag some of the cases.
+    #
+    # The 'terminator' function will be set by the 'firewall' script to
+    # either 'startup_error' or 'fatal_error' depending on the command and
+    # command phase
+    #
+    case "$@" in
+	*,|,*|*,,*)
+            [ -n "$terminator" ] && \
+		$terminator "Invalid comma-separated list \"$@\""
+            echo "Warning -- invalid comma-separated list \"$@\"" >&2
+	    ;;
+    esac
 
     list="$@"
     part="${list%%,*}"