EljakimHerrewijnen/Openwrt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

firewall: fix a possible deadlock when the firewall config has syntax errors during restart

Browse Source 
SVN-Revision: 21501
This commit is contained in:
Jo-Philipp Wich 2010-05-18 20:15:47 +00:00
parent 6b3bfbf943
commit 91519d51e9
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
package/firewall/files/lib/core.sh
View File

@ -8,14 +8,15 @@ include /lib/network
fw_start() { fw_start() {
fw_init fw_init
lock /var/lock/firewall.start
FW_DEFAULTS_APPLIED= FW_DEFAULTS_APPLIED=
fw_is_loaded && { fw_is_loaded && {
echo "firewall already loaded" >&2 echo "firewall already loaded" >&2
exit 1 exit 1
} }
lock /var/lock/firewall.start
uci_set_state firewall core "" firewall_state uci_set_state firewall core "" firewall_state
fw_clear DROP fw_clear DROP
@ -93,6 +94,7 @@ fw_die() {
echo "Error:" "$@" >&2 echo "Error:" "$@" >&2
fw_log error "$@" fw_log error "$@"
fw_stop fw_stop
lock -u /var/lock/firewall.start
exit 1 exit 1
} }