From 9817be72f8656f776e7715ec7539c4e423cfc4c2 Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Fri, 23 Jul 2010 13:58:40 -0700 Subject: [PATCH] Fix another couple of more locking bugs -- ported from 4.4.11.1 --- Shorewall-lite/shorewall-lite | 8 ++------ Shorewall6-lite/shorewall6-lite | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/Shorewall-lite/shorewall-lite b/Shorewall-lite/shorewall-lite index 933356007..63f31479c 100755 --- a/Shorewall-lite/shorewall-lite +++ b/Shorewall-lite/shorewall-lite @@ -628,17 +628,13 @@ case "$COMMAND" in shift start_command $@ ;; - stop|clear) + stop|reset|clear) [ $# -ne 1 ] && usage 1 verify_firewall_script [ -n "$nolock" ] || mutex_on - run_it $g_firewall $debugging $nolock $COMMAND + run_it $g_firewall $debugging $COMMAND [ -n "$nolock" ] || mutex_off ;; - reset) - verify_firewall_script - run_it $SHOREWALL_SHELL $g_firewall $debugging $nolock $@ - ;; restart) shift restart_command diff --git a/Shorewall6-lite/shorewall6-lite b/Shorewall6-lite/shorewall6-lite index 380913ed2..ba7ca2da9 100755 --- a/Shorewall6-lite/shorewall6-lite +++ b/Shorewall6-lite/shorewall6-lite @@ -616,7 +616,7 @@ case "$COMMAND" in [ $# -ne 1 ] && usage 1 verify_firewall_script [ -n "$nolock" ] || mutex_on - run_it $g_firewall $debugging $nolock $COMMAND + run_it $g_firewall $debugging $COMMAND [ -n "$nolock" ] || mutex_off ;; restart)