From 996f1294c0dd70484d9dfd1d50088d00c06a5815 Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Sun, 8 Aug 2010 07:04:49 -0700 Subject: [PATCH] Fix locking in up/down commands Signed-off-by: Tom Eastep --- Shorewall/shorewall | 6 +++--- Shorewall6/shorewall6 | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Shorewall/shorewall b/Shorewall/shorewall index 0eb0bd915..f706bbcb8 100755 --- a/Shorewall/shorewall +++ b/Shorewall/shorewall @@ -1637,9 +1637,9 @@ case "$COMMAND" in ;; up|down) [ -x $g_firewall ] || fatal_error "Shorewall has never been started" - mutex_on - run_it $g_firewall $g_debugging $nolock $@ - mutex_off + [ -n "$nolock" ] || mutex_on + run_it $g_firewall $g_debugging $@ + [ -n "$nolock" ] || mutex_off ;; reset) get_config diff --git a/Shorewall6/shorewall6 b/Shorewall6/shorewall6 index fb2e55193..f50309393 100755 --- a/Shorewall6/shorewall6 +++ b/Shorewall6/shorewall6 @@ -1549,9 +1549,9 @@ case "$COMMAND" in [ -n "$nolock" ] || mutex_off ;; up|down) - mutex_on + [ -n "$nolock" ] || mutex_on run_it $g_firewall $g_debugging $nolock $@ - mutex_off + [ -n "$nolock" ] || mutex_off ;; reset) get_config