mirror of
https://gitlab.com/shorewall/code.git
synced 2025-06-21 02:08:48 +02:00
Correct policy file zone validation during [re]start
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@130 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
parent
5fb079b6f3
commit
0665db84e1
@ -878,8 +878,6 @@ validate_policy()
|
|||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
echo " Policy \"$client $server $policy $loglevel\" Validated"
|
|
||||||
|
|
||||||
done < $TMP_DIR/policy
|
done < $TMP_DIR/policy
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -2608,6 +2606,10 @@ initialize_netfilter () {
|
|||||||
|
|
||||||
validate_hosts_file
|
validate_hosts_file
|
||||||
|
|
||||||
|
echo "Validating Policy file..."
|
||||||
|
|
||||||
|
validate_policy
|
||||||
|
|
||||||
echo "Determining Hosts in Zones..."
|
echo "Determining Hosts in Zones..."
|
||||||
|
|
||||||
determine_interfaces
|
determine_interfaces
|
||||||
@ -2884,8 +2886,6 @@ apply_policy_rules() {
|
|||||||
#
|
#
|
||||||
while read client server policy loglevel synparams; do
|
while read client server policy loglevel synparams; do
|
||||||
expandv client server policy loglevel synparams
|
expandv client server policy loglevel synparams
|
||||||
validate_zone $client
|
|
||||||
validate_zone $server
|
|
||||||
|
|
||||||
chain=${client}2${server}
|
chain=${client}2${server}
|
||||||
|
|
||||||
@ -3117,8 +3117,6 @@ define_firewall() # $1 = Command (Start or Restart)
|
|||||||
|
|
||||||
echo "Processing $policy..."
|
echo "Processing $policy..."
|
||||||
|
|
||||||
strip_file policy $policy
|
|
||||||
|
|
||||||
apply_policy_rules
|
apply_policy_rules
|
||||||
|
|
||||||
masq=`find_file masq`
|
masq=`find_file masq`
|
||||||
|
Loading…
x
Reference in New Issue
Block a user