More helpful BRIDGING error message

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

Shorewall/changelog.txt

@@ -8,6 +8,8 @@ Changes in 3.2.0 Beta 7
 
 4)  Avoid fatal error after missing forwardUPnP rule warning.
 
+5)  Issue more helpful BRIDGING=No error messages.
+
 Changes in 3.2.0 Beta 6
 
 1)  Fix tc "notfound" errors when 'restart' is run out of ip-up.local.

Shorewall/compiler

@@ -1466,9 +1466,9 @@ validate_hosts_file() {
 			   fatal_error "Bridged interfaces may not be defined in /etc/shorewall/interfaces: $host"
 		       check_bridge_port ${host%%:*}
 		       ;;
-		   *.*.*.*)
+		   *.*.*)
 		       ;;
-		   +*)
+		   *+|+*)
 		       eval ${z}_is_complex=Yes
 		       ;;
 		   *)
@@ -1479,9 +1479,14 @@ validate_hosts_file() {
 	       esac
 	   else
 	       case $host in
+		   *.*.*)
+		       ;;
 		   *+)
 		       eval ${z}_is_complex=Yes
 		       ;;
+		   *)
+		       fatal_error "BRIDGING=Yes is needed for this zone definition: $r"
+		       ;;
 	       esac
 	   fi
 

Shorewall/releasenotes.txt

@@ -47,6 +47,17 @@ Problems Corrected in 3.2.0 Beta 7
     isn't noticed, the ERROR message has been eliminated with the
     result that Shorewall now starts but won't handle UPnP properly.
 
+4)  If BRIDGING=No in shorewall.conf, then an entry in
+    /etc/shorewall/hosts such as the following would result in an
+    obscure failure of an iptables command:
+
+    loc   br0:eth0
+
+    Shorewall now detects this case and issues a more helpful error
+    message:
+
+    ERROR: BRIDGING=Yes is required for this zone definition: loc br0:eth0  
+
 Other changes in 3.2.0 Beta 7
 
 1)  'shorewall refresh' once again refreshes the tcrules and traffic shaping.