Add error message for invalid HOST(S) column contents

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

Shorewall2/changelog.txt

@@ -21,6 +21,8 @@ Changes in 2.2.4
 
 9) Allow 'none' in /etc/shorewall/rules.
 
+10) Add error message for invalid HOST(S) column contents.
+
 Changes in 2.2.3
 
 1) Added the 'continue' extension script.

Shorewall2/firewall

@@ -975,13 +975,21 @@ validate_hosts_file() {
        r="$z $hosts $options"
        validate_zone1 $z || startup_error "Invalid zone ($z) in record \"$r\""
 
-       interface=${hosts%%:*}
+       case $hosts in
-       iface=$(chain_base $interface)
+	   *:*)
 
-       list_search  $interface $ALL_INTERFACES || \
+	       interface=${hosts%%:*}
-	   startup_error "Unknown interface ($interface) in record \"$r\""
+	       iface=$(chain_base $interface)
 
-       hosts=${hosts#*:}
+	       list_search  $interface $ALL_INTERFACES || \
+		   startup_error "Unknown interface ($interface) in record \"$r\""
+
+	       hosts=${hosts#*:}
+	       ;;
+	   *)
+	       fatal_error "Invalid HOST(S) column contents: $hosts"
+	       ;;
+       esac
 
        eval ports=\$${iface}_ports
        eval zports=\$${z}_ports

Shorewall2/releasenotes.txt

@@ -11,6 +11,12 @@ Problems corrected in version 2.2.4
 
        Error: No policy defined for zone <z1> to zone <z2> 
 
+2) When only an interface name appeared in the HOST(S) column of an
+   /etc/shorewall/hosts file entry, a misleading iptables error message
+   resulted. Now the following message is generated:
+
+       Error: Invalid HOST(S) column contents: <column contents>
+
 -----------------------------------------------------------------------
 New Features in version 2.2.4