[Pkg-ossec-devel] [SCM] Git repository for pkg-ossec branch, master, updated. f89fb2c00b1a2606035e5cd0e35b4ebe99f049ac

[Javier Fernandez-Sanguino]

The following commit has been merged in the master branch:
commit be03360c52fdbf581d68003f399ca09a74858f8a
Author: Javier Fernandez-Sanguino <jfs at debian.org>
Date:   Wed Aug 29 01:50:37 2012 +0200

    Apply the patch also to the other control scripts

diff --git a/debian/patches/06-control-return-status-value b/debian/patches/06-control-return-status-value
index 9d2a878..6537cff 100644
--- a/debian/patches/06-control-return-status-value
+++ b/debian/patches/06-control-return-status-value
@@ -1,7 +1,7 @@
 Index: pkg-ossec/src/init/ossec-server.sh
 ===================================================================
---- pkg-ossec.orig/src/init/ossec-server.sh	2012-08-29 00:47:17.000000000 +0200
-+++ pkg-ossec/src/init/ossec-server.sh	2012-08-29 00:49:19.000000000 +0200
+--- pkg-ossec.orig/src/init/ossec-server.sh	2012-08-29 01:19:58.000000000 +0200
++++ pkg-ossec/src/init/ossec-server.sh	2012-08-29 01:48:27.000000000 +0200
 @@ -189,14 +189,17 @@
  # Status function
  status()
@@ -28,3 +28,66 @@ Index: pkg-ossec/src/init/ossec-server.sh
  	;;
    help)  
      help
+Index: pkg-ossec/src/init/ossec-local.sh
+===================================================================
+--- pkg-ossec.orig/src/init/ossec-local.sh	2012-08-29 01:47:14.000000000 +0200
++++ pkg-ossec/src/init/ossec-local.sh	2012-08-29 01:48:23.000000000 +0200
+@@ -188,16 +188,20 @@
+ # Status function
+ status()
+ {
++    retvalue=0
+     for i in ${DAEMONS}; do
+         pstatus ${i};
+         if [ $? = 0 ]; then
+             echo "${i} not running..."
++	    retvalue=1 # We return with error if some of the components is not running
+         else
+             echo "${i} is running..."
+         fi
+     done             
++    return $retvalue
+ }
+ 
++
+ testconfig()
+ {
+     # We first loop to check the config. 
+@@ -323,6 +327,7 @@
+ 	;;
+   status)
+     status
++    exit $?
+ 	;;
+   help)  
+     help
+Index: pkg-ossec/src/init/ossec-client.sh
+===================================================================
+--- pkg-ossec.orig/src/init/ossec-client.sh	2012-08-29 01:49:40.000000000 +0200
++++ pkg-ossec/src/init/ossec-client.sh	2012-08-29 01:50:20.000000000 +0200
+@@ -113,14 +113,17 @@
+ # Status function
+ status()
+ {
++    retvalue=0
+     for i in ${DAEMONS}; do
+         pstatus ${i};
+         if [ $? = 0 ]; then
+             echo "${i} not running..."
++	    retvalue=1 # We return with error if some of the components is not running
+         else
+             echo "${i} is running..."
+         fi
+     done             
++    return $retvalue
+ }
+ 
+ testconfig()
+@@ -242,6 +245,7 @@
+ 	;;
+   status)
+     status
++    exit $?
+ 	;;
+   help)  
+     help

-- 
Git repository for pkg-ossec