Shoreline Firewall (Shorewall)

Update of /cvsroot/shorewall/Shorewall
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12259

Modified Files:
	changelog.txt firewall releasenotes.txt zones 
Log Message:
Rename 'plain' to 'ipv4' in zones file

Index: zones
===================================================================
RCS file: /cvsroot/shorewall/Shorewall/zones,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- zones	21 Sep 2005 16:51:52 -0000	1.22
+++ zones	30 Sep 2005 17:13:37 -0000	1.23
@@ -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

Index: firewall
===================================================================
RCS file: /cvsroot/shorewall/Shorewall/firewall,v
retrieving revision 1.470
retrieving revision 1.471
diff -u -d -r1.470 -r1.471
--- firewall	30 Sep 2005 16:54:24 -0000	1.470
+++ firewall	30 Sep 2005 17:13:37 -0000	1.471
@@ -553,8 +553,8 @@
         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
 		    ;;

Index: releasenotes.txt
===================================================================
RCS file: /cvsroot/shorewall/Shorewall/releasenotes.txt,v
retrieving revision 1.229
retrieving revision 1.230
diff -u -d -r1.229 -r1.230
--- releasenotes.txt	30 Sep 2005 16:54:24 -0000	1.229
+++ releasenotes.txt	30 Sep 2005 17:13:37 -0000	1.230
@@ -61,9 +61,9 @@
 			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 @@
 			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

Index: changelog.txt
===================================================================
RCS file: /cvsroot/shorewall/Shorewall/changelog.txt,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -d -r1.193 -r1.194
--- changelog.txt	30 Sep 2005 16:54:24 -0000	1.193
+++ changelog.txt	30 Sep 2005 17:13:37 -0000	1.194
@@ -6,6 +6,8 @@
 
 3) Add capabilities report to "shorewall dump".
 
+4) Rename 'plain' to 'ipv4'
+
 Changes in 2.5.6
 
 1) Finish install/fallback cleanup.