Fix stupid bug in zones file alchemy -- take 3

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@2626 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2005-09-02 22:56:35 +00:00
parent 1905664bca
commit d6cf893327

View File

@ -500,17 +500,16 @@ determine_zones()
ZONES=
if [ -n "$parents" ]; then
for z in $zones; do
if [ -z "$merged" ] && list_search $z $parents; then
ZONES="$ZONES $zone"
merged=Yes
fi
ZONES="$ZONES $z"
for z in $zones; do
if [ -z "$merged" ] && list_search $z $parents; then
ZONES="$ZONES $zone"
merged=Yes
fi
ZONES="$ZONES $z"
done
[ -n "$merged" ] || ZONES="$zones $zone"
}
[ -n "$merged" ] || ZONES="$ZONES $zone"
}
strip_file zones