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

Get rid of BPORT_ZONES array

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6606 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2007-06-19 22:57:17 +00:00
parent dae9ee1baf
commit 1dcf4b694f
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Shorewall-common/lib.config
View File

@ -233,7 +233,6 @@ determine_zones()
ZONES=
IPV4_ZONES=
IPSEC_ZONES=
BPORT_ZONES=
[ "$IPSECFILE" = zones ] && new_zone_file=Yes || test -n "${FW:=fw}"
@ -296,7 +295,6 @@ determine_zones()
[ "$PROGRAM" = compiler ] && startup_error "Invalid Zone Type: $type"
list_search $zone $ZONES $FW && startup_error "Zone $zone is defined more than once"
merge_zone
BPORT_ZONES="$BPORT_ZONES $zone"
BRIDGING=Yes
;;
*)

9
Shorewall-common/lib.dynamiczones
View File

@ -107,8 +107,6 @@ add_to_zone() # $1...${n-1} = <interface>[:<hosts>] $n = zone
[ "$zone" = $FW ] && startup_error "Can't add $1 to firewall zone"
list_search $zone $BPORT_ZONES && startup_error "Bridge Port zones may not be dynamically modified"
#
# Be sure that Shorewall has been restarted using a DZ-aware version of the code
#
@ -121,6 +119,13 @@ add_to_zone() # $1...${n-1} = <interface>[:<hosts>] $n = zone
while read z type hosts; do
if [ "$z" = "$zone" ]; then
case $type in
bport4:*)
rm -f ${VARDIR}/zones_$$
startup_error "Bridge Port zones may not be dynamically modified"
;;
esac
case "$hosts" in
*exclude*)
rm -f ${VARDIR}/zones_$$