holm/shorewall_code
1
0
Fork 0
forked from extern/shorewall_code
Code Pull Requests Activity

Rename 'plain' to 'ipv4' in zones file

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@2759 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2005-09-30 17:16:22 +00:00
parent 84af786df4
commit a7258ce1ff
7 changed files with 30 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Samples/one-interface/zones
View File

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

14
Samples/three-interfaces/zones
View File

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

12
Samples/two-interfaces/zones
View File

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

2
Shorewall/changelog.txt
View File

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

4
Shorewall/firewall
View File

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

8
Shorewall/releasenotes.txt
View File

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

8
Shorewall/zones
View File

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