[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 b6728db64281c18d4b7706888f8e53eda503d84d
Author: Javier Fernandez-Sanguino <jfs at debian.org>
Date:   Wed Aug 29 01:57:51 2012 +0200

    Do not output two failure messages

diff --git a/debian/ossec-hids-agent.init b/debian/ossec-hids-agent.init
index b0e3806..8466913 100755
--- a/debian/ossec-hids-agent.init
+++ b/debian/ossec-hids-agent.init
@@ -66,7 +66,7 @@ do_test_rules()
 {
 	echo | ${DIRECTORY}/ossec-logtest > /dev/null 2>&1;
 	if [ ! $? = 0 ]; then
-		log_failure_msg "the OSSEC ruleset is not valid, the daemon will not start. Review the output of ${DIRECTORY}/ossec-logtest"
+		log_progress_msg "the OSSEC ruleset is not valid, the daemon will not start. Review the output of ${DIRECTORY}/ossec-logtest"
 		return 1
 	fi
 	return 0
@@ -121,7 +121,7 @@ case "$1" in
         if  [ $myret -eq 0 ] ; then
             log_end_msg 0
         else
-	     [ -z "$DEBIAN_SCRIPT_DEBUG" ] && log_failure_msg "review the logfile $LOGFILE"
+	     [ -z "$DEBIAN_SCRIPT_DEBUG" ] && log_progress_msg "review the logfile $LOGFILE"
             log_end_msg 1
         fi
         exit $myret
@@ -133,7 +133,7 @@ case "$1" in
         if  [ $myret -eq 0 ] ; then
             log_end_msg 0
         else
-            [ -z "$DEBIAN_SCRIPT_DEBUG" ] && log_failure_msg "review the logfile $LOGFILE"
+            [ -z "$DEBIAN_SCRIPT_DEBUG" ] && log_progress_msg "review the logfile $LOGFILE"
             log_end_msg 1
         fi
         exit $myret
@@ -152,7 +152,7 @@ case "$1" in
 		;;
 	  *)
 	  	# Failed to stop
-		[ -z "$DEBIAN_SCRIPT_DEBUG" ] && log_failure_msg "review the logfile $LOGFILE"
+		[ -z "$DEBIAN_SCRIPT_DEBUG" ] && log_progress_msg "review the logfile $LOGFILE"
 		log_end_msg 1
 		;;
 	esac
@@ -164,8 +164,8 @@ case "$1" in
         if  [ $myret -eq 0 ] ; then
             log_end_msg 0
         else
-	    log_failure_msg "review the logfile $LOGFILE"
-            log_end_msg 1
+	    [ -z "$DEBIAN_SCRIPT_DEBUG" ] && log_progress_msg "review the logfile $LOGFILE"
+	    log_end_msg 1
         fi
         exit $myret
 	;;
diff --git a/debian/ossec-hids-local.init b/debian/ossec-hids-local.init
index 6f26463..31d6186 100755
--- a/debian/ossec-hids-local.init
+++ b/debian/ossec-hids-local.init
@@ -66,7 +66,7 @@ do_test_rules()
 {
 	echo | ${DIRECTORY}/ossec-logtest > /dev/null 2>&1;
 	if [ ! $? = 0 ]; then
-		log_failure_msg "the OSSEC ruleset is not valid, the daemon will not start. Review the output of ${DIRECTORY}/ossec-logtest"
+		log_progress_msg "the OSSEC ruleset is not valid, the daemon will not start. Review the output of ${DIRECTORY}/ossec-logtest"
 		return 1
 	fi
 	return 0
@@ -121,7 +121,7 @@ case "$1" in
         if  [ $myret -eq 0 ] ; then
             log_end_msg 0
         else
-	    [ -z "$DEBIAN_SCRIPT_DEBUG" ] && log_failure_msg "review the logfile $LOGFILE"
+	    [ -z "$DEBIAN_SCRIPT_DEBUG" ] && log_progress_msg "review the logfile $LOGFILE"
             log_end_msg 1
         fi
         exit $myret
@@ -133,7 +133,7 @@ case "$1" in
         if  [ $myret -eq 0 ] ; then
             log_end_msg 0
         else
-	    [ -z "$DEBIAN_SCRIPT_DEBUG" ] && log_failure_msg "review the logfile $LOGFILE"
+	    [ -z "$DEBIAN_SCRIPT_DEBUG" ] && log_progress_msg "review the logfile $LOGFILE"
             log_end_msg 1
         fi
         exit $myret
@@ -152,7 +152,7 @@ case "$1" in
 		;;
 	  *)
 	  	# Failed to stop
-		log_failure_msg "review the logfile $LOGFILE"
+		[ -z "$DEBIAN_SCRIPT_DEBUG" ] && log_failure_msg "review the logfile $LOGFILE"
 		log_end_msg 1
 		;;
 	esac
@@ -164,7 +164,7 @@ case "$1" in
         if  [ $myret -eq 0 ] ; then
             log_end_msg 0
         else
-	    [ -z "$DEBIAN_SCRIPT_DEBUG" ] &&  log_failure_msg "review the logfile $LOGFILE"
+	    [ -z "$DEBIAN_SCRIPT_DEBUG" ] &&  log_progress_msg "review the logfile $LOGFILE"
             log_end_msg 1
         fi
         exit $myret
diff --git a/debian/ossec-hids-server.init b/debian/ossec-hids-server.init
index 1df6b37..6ee62b8 100755
--- a/debian/ossec-hids-server.init
+++ b/debian/ossec-hids-server.init
@@ -66,7 +66,7 @@ do_test_rules()
 {
 	echo | ${DIRECTORY}/ossec-logtest > /dev/null 2>&1;
 	if [ ! $? = 0 ]; then
-		log_failure_msg "the OSSEC ruleset is not valid, the daemon will not start. Review the output of ${DIRECTORY}/ossec-logtest"
+		log_progress_msg "the OSSEC ruleset is not valid, the daemon will not start. Review the output of ${DIRECTORY}/ossec-logtest"
 		return 1
 	fi
 	return 0
@@ -121,7 +121,7 @@ case "$1" in
         if  [ $myret -eq 0 ] ; then
             log_end_msg 0
         else
-	    [ -z "$DEBIAN_SCRIPT_DEBUG" ] && log_failure_msg "review the logfile $LOGFILE"
+	    [ -z "$DEBIAN_SCRIPT_DEBUG" ] && log_progress_msg "review the logfile $LOGFILE"
             log_end_msg 1
         fi
         exit $myret
@@ -133,7 +133,7 @@ case "$1" in
         if  [ $myret -eq 0 ] ; then
             log_end_msg 0
         else
-	    [ -z "$DEBIAN_SCRIPT_DEBUG" ] && log_failure_msg "review the logfile $LOGFILE"
+	    [ -z "$DEBIAN_SCRIPT_DEBUG" ] && log_progress_msg "review the logfile $LOGFILE"
             log_end_msg 1
         fi
         exit $myret
@@ -152,7 +152,7 @@ case "$1" in
 		;;
 	  *)
 	  	# Failed to stop
-		[ -z "$DEBIAN_SCRIPT_DEBUG" ] && log_failure_msg "review the logfile $LOGFILE"
+		[ -z "$DEBIAN_SCRIPT_DEBUG" ] && log_progress_msg "review the logfile $LOGFILE"
 		log_end_msg 1
 		;;
 	esac
@@ -164,7 +164,7 @@ case "$1" in
         if  [ $myret -eq 0 ] ; then
             log_end_msg 0
         else
-	    [ -z "$DEBIAN_SCRIPT_DEBUG" ] && log_failure_msg "review the logfile $LOGFILE"
+	    [ -z "$DEBIAN_SCRIPT_DEBUG" ] && log_progress_msg "review the logfile $LOGFILE"
             log_end_msg 1
         fi
         exit $myret

-- 
Git repository for pkg-ossec