Rename 'plain' to 'ipv4' in zones file

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

Samples/one-interface/zones

@@ -20,16 +20,16 @@
 #		Example:
 #
 #			#ZONE     TYPE     OPTIONS
-#			a	  plain
-#			b	  plain
-#			c:a,b     plain
+#			a	  ipv4
+#			b	  ipv4
+#			c:a,b     ipv4
 #
 #		Currently, Shorewall uses this information only to reorder the
 #		zone list so that parent zones appear after their subzones in
 #		the list. In the future, Shorewall may make more extensive use
 #		of that information.
 #
-#	TYPE	plain -	This is the standard Shorewall zone type and is the
+#	TYPE	ipv4 -	This is the standard Shorewall zone type and is the
 #			default if you leave this column empty or if you enter
 #			"-" in the column. Communication with some zone hosts
 #			may be encrypted. Encrypted hosts are designated using
@@ -90,5 +90,5 @@
 #ZONE	TYPE	OPTIONS			IN			OUT
 #					OPTIONS			OPTIONS\
 fw	firewall
-net	plain
+net	ipv4
 #LAST LINE - ADD YOUR ENTRIES ABOVE THIS ONE - DO NOT REMOVE

Samples/three-interfaces/zones

@@ -20,16 +20,16 @@
 #		Example:
 #
 #			#ZONE     TYPE     OPTIONS
-#			a	  plain
-#			b	  plain
-#			c:a,b     plain
+#			a	  ipv4
+#			b	  ipv4
+#			c:a,b     ipv4
 #
 #		Currently, Shorewall uses this information only to reorder the
 #		zone list so that parent zones appear after their subzones in
 #		the list. In the future, Shorewall may make more extensive use
 #		of that information.
 #
-#	TYPE	plain -	This is the standard Shorewall zone type and is the
+#	TYPE	ipv4 -	This is the standard Shorewall zone type and is the
 #			default if you leave this column empty or if you enter
 #			"-" in the column. Communication with some zone hosts
 #			may be encrypted. Encrypted hosts are designated using
@@ -88,7 +88,7 @@
 #ZONE	TYPE	OPTIONS			IN			OUT
 #					OPTIONS			OPTIONS
 fw	firewall
-net	plain
-loc	plain
-dmz	plain
+net	ipv4
+loc	ipv4
+dmz	ipv4
 #LAST LINE - ADD YOUR ENTRIES ABOVE THIS ONE - DO NOT REMOVE

Samples/two-interfaces/zones

@@ -20,16 +20,16 @@
 #		Example:
 #
 #			#ZONE     TYPE     OPTIONS
-#			a	  plain
-#			b	  plain
-#			c:a,b     plain
+#			a	  ipv4
+#			b	  ipv4
+#			c:a,b     ipv4
 #
 #		Currently, Shorewall uses this information only to reorder the
 #		zone list so that parent zones appear after their subzones in
 #		the list. In the future, Shorewall may make more extensive use
 #		of that information.
 #
-#	TYPE	plain -	This is the standard Shorewall zone type and is the
+#	TYPE	ipv4 -	This is the standard Shorewall zone type and is the
 #			default if you leave this column empty or if you enter
 #			"-" in the column. Communication with some zone hosts
 #			may be encrypted. Encrypted hosts are designated using
@@ -88,7 +88,7 @@
 #ZONE	TYPE	OPTIONS			IN			OUT
 #					OPTIONS			OPTIONS
 fw	firewall
-net	plain
-loc	plain
+net	ipv4
+loc	ipv4
 
 #LAST LINE - ADD YOUR ENTRIES ABOVE THIS ONE - DO NOT REMOVE

Shorewall/changelog.txt

@@ -6,6 +6,8 @@ Changes in 2.5.7
 
 3) Add capabilities report to "shorewall dump".
 
+4) Rename 'plain' to 'ipv4'
+
 Changes in 2.5.6
 
 1) Finish install/fallback cleanup.

Shorewall/firewall

@@ -553,8 +553,8 @@ determine_zones()
         esac
 
 	if [ -n "$new_zone_file" ]; then
-	    case ${type:=plain} in
-		plain|-)
+	    case ${type:=ipv4} in
+		ipv4|plain|-)
 		    list_search $zone $ZONES $FW && startup_error "Zone $zone is defined more than once"
 		    merge_zone
 		    ;;

Shorewall/releasenotes.txt

@@ -61,9 +61,9 @@ Migration Considerations:
 			Example:
 
 				#ZONE     TYPE     OPTIONS
-				a	  plain
-				b	  plain
-				c:a,b     plain
+				a	  ipv4
+				b	  ipv4
+				c:a,b     ipv4
 
 		        Currently, Shorewall uses this information only
 		        to reorder the zone list so that parent zones
@@ -71,7 +71,7 @@ Migration Considerations:
 			future, Shorewall may make more extensive use
 		        of that information.
 
-	TYPE	plain -	This is the standard Shorewall zone type and is
+	TYPE	ipv4 -	This is the standard Shorewall zone type and is
 			the default if the column is left empty or if
 			it is entered as "-".  Communication with some
 			zone hosts may be encrypted. Encrypted hosts

Shorewall/zones

@@ -20,16 +20,16 @@
 #		Example:
 #
 #			#ZONE     TYPE     OPTIONS
-#			a	  plain
-#			b	  plain
-#			c:a,b     plain
+#			a	  ipv4
+#			b	  ipv4
+#			c:a,b     ipv4
 #
 #		Currently, Shorewall uses this information only to reorder the
 #		zone list so that parent zones appear after their subzones in
 #		the list. In the future, Shorewall may make more extensive use
 #		of that information.
 #
-#	TYPE	plain -	This is the standard Shorewall zone type and is the
+#	TYPE	ipv4 -	This is the standard Shorewall zone type and is the
 #			default if you leave this column empty or if you enter
 #			"-" in the column. Communication with some zone hosts
 #			may be encrypted. Encrypted hosts are designated using