From 531474592c49cbaa13fb3d3756c13ba5f1f6537c Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Fri, 13 Jan 2012 15:42:20 -0800 Subject: [PATCH] Correct handling of '-p' Signed-off-by: Tom Eastep --- Shorewall-core/lib.cli | 2 +- Shorewall/lib.core | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Shorewall-core/lib.cli b/Shorewall-core/lib.cli index af86be1c5..12060a350 100644 --- a/Shorewall-core/lib.cli +++ b/Shorewall-core/lib.cli @@ -2771,7 +2771,7 @@ restart_command() { option=${option#n} ;; p*) - [ -n "$(which conntrack)" ] || fatal_error "The '-p' option requires the conntrack utility which does not appear to be installed on this system" + [ -n "$(mywhich conntrack)" ] || fatal_error "The '-p' option requires the conntrack utility which does not appear to be installed on this system" g_purge=Yes option=${option%p} ;; diff --git a/Shorewall/lib.core b/Shorewall/lib.core index 45c1b27d2..25aa86a65 100644 --- a/Shorewall/lib.core +++ b/Shorewall/lib.core @@ -403,7 +403,7 @@ conditionally_flush_conntrack() { if [ -n "$g_purge" ]; then if [ -n $(mywhich conntrack) ]; then - conntrack -f ipv$g_family -F + conntrack -F else error_message "WARNING: The '-p' option requires the conntrack utility which does not appear to be installed on this system" fi