Fix another couple of more locking bugs -- ported from 4.4.11.1

This commit is contained in:
Tom Eastep 2010-07-23 13:58:40 -07:00
parent e5a7d2ae69
commit 9817be72f8
2 changed files with 3 additions and 7 deletions

View File

@ -628,17 +628,13 @@ case "$COMMAND" in
shift shift
start_command $@ start_command $@
;; ;;
stop|clear) stop|reset|clear)
[ $# -ne 1 ] && usage 1 [ $# -ne 1 ] && usage 1
verify_firewall_script verify_firewall_script
[ -n "$nolock" ] || mutex_on [ -n "$nolock" ] || mutex_on
run_it $g_firewall $debugging $nolock $COMMAND run_it $g_firewall $debugging $COMMAND
[ -n "$nolock" ] || mutex_off [ -n "$nolock" ] || mutex_off
;; ;;
reset)
verify_firewall_script
run_it $SHOREWALL_SHELL $g_firewall $debugging $nolock $@
;;
restart) restart)
shift shift
restart_command restart_command

View File

@ -616,7 +616,7 @@ case "$COMMAND" in
[ $# -ne 1 ] && usage 1 [ $# -ne 1 ] && usage 1
verify_firewall_script verify_firewall_script
[ -n "$nolock" ] || mutex_on [ -n "$nolock" ] || mutex_on
run_it $g_firewall $debugging $nolock $COMMAND run_it $g_firewall $debugging $COMMAND
[ -n "$nolock" ] || mutex_off [ -n "$nolock" ] || mutex_off
;; ;;
restart) restart)