mirror of
https://gitlab.com/shorewall/code.git
synced 2025-02-02 19:09:33 +01:00
Rename 'plain' to 'ipv4' in zones file -- Take 2
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@2762 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
parent
c7566473d5
commit
3087be1d83
@ -554,11 +554,11 @@ determine_zones()
|
|||||||
|
|
||||||
if [ -n "$new_zone_file" ]; then
|
if [ -n "$new_zone_file" ]; then
|
||||||
case ${type:=ipv4} in
|
case ${type:=ipv4} in
|
||||||
ipv4|plain|-)
|
ipv4|IPv4|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
|
||||||
;;
|
;;
|
||||||
ipsec)
|
ipsec|IPSEC|ipsec4|IPSEC4)
|
||||||
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"
|
||||||
[ -n "$POLICY_MATCH" ] || fatal_error "Your kernel and/or iptables does not support policy match"
|
[ -n "$POLICY_MATCH" ] || fatal_error "Your kernel and/or iptables does not support policy match"
|
||||||
eval ${zone}_is_ipsec=Yes
|
eval ${zone}_is_ipsec=Yes
|
||||||
|
@ -16,6 +16,10 @@ New Features in 2.5.7:
|
|||||||
1) The output of "shorewall dump" now includes a capabilities report
|
1) The output of "shorewall dump" now includes a capabilities report
|
||||||
such as the one produced by "shorewall show capabilities".
|
such as the one produced by "shorewall show capabilities".
|
||||||
|
|
||||||
|
2) The "plain" zone type has been replaced by "ipv4". The types
|
||||||
|
"IPv4" and "IPV4" are synonyms for "ipv4". In addition, "IPSEC",
|
||||||
|
"ipsec4" and "IPSEC4" are recognized synonyms for "ipsec".
|
||||||
|
|
||||||
Migration Considerations:
|
Migration Considerations:
|
||||||
|
|
||||||
1) The "monitor" command has been eliminated.
|
1) The "monitor" command has been eliminated.
|
||||||
|
Loading…
Reference in New Issue
Block a user