Imported Upstream version 2.5.1

[ossec-hids.git] / src / init / ossec-client.sh

diff --git a/src/init/ossec-client.sh b/src/init/ossec-client.sh
index e05d615..f8d6159 100755 (executable)
--- a/src/init/ossec-client.sh
+++ b/src/init/ossec-client.sh
@@ -11,7 +11,7 @@ DIR=`dirname $PWD`;
 
 ###  Do not modify bellow here ###
 NAME="OSSEC HIDS"
-VERSION="v2.3"
+VERSION="v2.5.1"
 AUTHOR="Trend Micro Inc."
 DAEMONS="ossec-logcollector ossec-syscheckd ossec-agentd ossec-execd"
 
@@ -111,16 +111,8 @@ status()
     done             
 }
 
-
-# Start function
-start()
+testconfig()
 {
-    SDAEMONS="ossec-execd ossec-agentd ossec-logcollector ossec-syscheckd"
-    
-    echo "Starting $NAME $VERSION (by $AUTHOR)..."
-    lock;
-    checkpid;
-
     # We first loop to check the config. 
     for i in ${SDAEMONS}; do
         ${DIR}/bin/${i} -t;
@@ -130,6 +122,17 @@ start()
             exit 1;
         fi    
     done
+}
+
+# Start function
+start()
+{
+    SDAEMONS="ossec-execd ossec-agentd ossec-logcollector ossec-syscheckd"
+    
+    echo "Starting $NAME $VERSION (by $AUTHOR)..."
+    lock;
+    checkpid;
+
     
     # We actually start them now.
     for i in ${SDAEMONS}; do
@@ -214,12 +217,14 @@ stopa()
 
 case "$1" in
   start)
+    testconfig
        start
        ;;
   stop) 
        stopa
        ;;
   restart)
+    testconfig
        stopa
        start
        ;;