Improve error message on maclist upgraded record

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

Shorewall/changelog.txt

@@ -4,6 +4,8 @@ Changes in 3.4.0 Beta 3
 
 2)  Fix ipp2p:udp handling in action body.
 
+3)  Be more careful about converting pre-3.2 maclist records.
+
 Changes in 3.4.0 Beta 2
 
 1)  Fix for empty blacklist file.

Shorewall/lib.maclist

@@ -144,11 +144,21 @@ setup_mac_lists() # $1 = Phase Number
 		    target=DROP
 		    ;;
 		*)
-		    addresses="$mac"
-		    mac="$interface"
-		    interface="$disposition"
-		    disposition=ACCEPT
-		    target=RETURN
+		    case "$interface" in
+			*:*:*|~*-*-*)
+			    #
+			    # Pre-3.2 record format
+			    #
+			    addresses="$mac"
+			    mac="$interface"
+			    interface="$disposition"
+			    disposition=ACCEPT
+			    target=RETURN
+			    ;;
+			*)
+			    fatal_error "Invalid DISPOSITION ($disposition) in rule \"$disposition $interface $mac $addresses\""
+			    ;;
+		    esac
 		    ;;
 	    esac
 

Shorewall/releasenotes.txt

@@ -36,6 +36,24 @@ Problems Corrected in 3.4.0 Beta 3
 2)  Previously, "ipp2p:udp" was incorrectly rejected in the PROTO
     column of an action definition.
 
+3)  Previously, if an invalid DISPOSITION was specified in a record in
+    /etc/shorewall/maclist, then a confusing error message would
+    result.
+
+    Example:
+
+    /etc/shorewall/mac:
+
+	ALOW:info	eth0	02:0C:03:04:05:06
+
+    Error message:
+
+	ERROR: No hosts on ALOW:info have the maclist option specified
+
+    The new error message is:
+
+        ERROR: Invalid DISPOSITION (ALOW:info) in rule "ALOW:info eth0 02:0C:03:04:05:06"
+
 Migration Considerations:
 
 1)  Shorewall supports the notion of "default actions". A default