mirror of
https://gitlab.com/shorewall/code.git
synced 2025-06-21 02:08:48 +02:00
Detect multiple firewall zones; fix inappropriate call to fatal_error; Display the firewall zone name
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@2776 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
parent
2a0a8d024e
commit
bb8a928f9b
@ -561,6 +561,7 @@ determine_zones()
|
|||||||
merge_zone
|
merge_zone
|
||||||
;;
|
;;
|
||||||
firewall)
|
firewall)
|
||||||
|
[ -n "$FW" ] && startup_error "Only one firewall zone may be defined"
|
||||||
list_search $zone $ZONES && startup_error "Zone $zone is defined more than once"
|
list_search $zone $ZONES && startup_error "Zone $zone is defined more than once"
|
||||||
[ -n "$parents" ] && startup_error "The firewall zone may not be nested"
|
[ -n "$parents" ] && startup_error "The firewall zone may not be nested"
|
||||||
for r in $rest; do
|
for r in $rest; do
|
||||||
@ -1442,7 +1443,7 @@ validate_hosts_file() {
|
|||||||
hosts=${hosts#*:}
|
hosts=${hosts#*:}
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
fatal_error "Invalid HOST(S) column contents: $hosts"
|
startup_error "Invalid HOST(S) column contents: $hosts"
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
@ -3727,6 +3728,7 @@ check_config() {
|
|||||||
determine_zones
|
determine_zones
|
||||||
|
|
||||||
display_list "Zones:" $ZONES
|
display_list "Zones:" $ZONES
|
||||||
|
display_list "Firewall Zone:" $FW
|
||||||
|
|
||||||
setup_ipsec
|
setup_ipsec
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user