Merge remote-tracking branch 'origin/master' into next

[ipfire-2.x.git] / src / initscripts / init.d / snort

diff --git a/src/initscripts/init.d/snort b/src/initscripts/init.d/snort
index 87c034ead0d0eb87e6aec8b0e0fc0187e3feda57..42968d8da1cbe77124dc6c2ecefefcce7b5d0dab 100644 (file)
--- a/src/initscripts/init.d/snort
+++ b/src/initscripts/init.d/snort
@@ -61,15 +61,15 @@ case "$1" in
                        fi
                fi
                HOMENET+="127.0.0.1"
-               echo "var HOME_NET [$HOMENET]" > /etc/snort/vars
+               echo "ipvar HOME_NET [$HOMENET]" > /etc/snort/vars
 
                DNS1=`cat /var/ipfire/red/dns1 2>/dev/null`
                DNS2=`cat /var/ipfire/red/dns2 2>/dev/null`
 
                if [ "$DNS2" ]; then
-                       echo "var DNS_SERVERS [$DNS1,$DNS2]" >> /etc/snort/vars
+                       echo "ipvar DNS_SERVERS [$DNS1,$DNS2]" >> /etc/snort/vars
                else
-                       echo "var DNS_SERVERS $DNS1" >> /etc/snort/vars
+                       echo "ipvar DNS_SERVERS $DNS1" >> /etc/snort/vars
                fi
 
                 for DEVICE in $DEVICES; do
@@ -118,7 +118,7 @@ case "$1" in
               
               rm /var/run/snort_* >/dev/null 2>/dev/null
                 
-              if ([ -r /var/ipfire/guardian/enable ] || [ -n $(pidofproc /usr/local/bin/guardian.pl) ]); then
+              if ([ -r /var/ipfire/guardian/enable ] || [ ! -z $(pidofproc /usr/local/bin/guardian.pl) ]); then
                          boot_mesg "Stopping Guardian..."
                          killproc /usr/local/bin/guardian.pl
                          fi