From: Christian Schmidt <christian.schmidt@ipfire.org>
Date: Mon, 21 Jun 2010 17:03:10 +0000 (+0200)
Subject: Fixed Guardian deactivate bug #0000664
X-Git-Tag: v2.9-beta1~211
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=1b37278adbca2710dedadf494c0ff5b60df494a6;hp=841f013e264d21dd6d3a725325623dbc21aac4f9

Fixed Guardian deactivate bug #0000664
---

diff --git a/src/initscripts/init.d/snort b/src/initscripts/init.d/snort
index d22cbc4e61..87c034ead0 100644
--- a/src/initscripts/init.d/snort
+++ b/src/initscripts/init.d/snort
@@ -118,7 +118,7 @@ case "$1" in
               
               rm /var/run/snort_* >/dev/null 2>/dev/null
                 
-              if [ -r /var/ipfire/guardian/enable ]; then
+              if ([ -r /var/ipfire/guardian/enable ] || [ -n $(pidofproc /usr/local/bin/guardian.pl) ]); then
 		          boot_mesg "Stopping Guardian..."
 		          killproc /usr/local/bin/guardian.pl
 		          fi