Changeset 521 for trunk

Timestamp:

Apr 5, 2017, 9:46:39 PM (8 years ago)

Author:

katerina

Message:

Fix for ticket #416 (initscript issue on RedHat).

Location:

trunk

Files:

• configure.ac (modified) (1 diff)
• docs/Changelog (modified) (2 diffs)
• init/samhain.startLinux.in (modified) (1 diff)

trunk/configure.ac

@@ -12 +12 @@
 dnl start
 dnl
-AM_INIT_AUTOMAKE(samhain, 4.2.0)
+AM_INIT_AUTOMAKE(samhain, 4.2.1)
 AC_DEFINE([SAMHAIN], 1, [Application is samhain])
 AC_CANONICAL_HOST

trunk/docs/Changelog

@@ -1 +1 @@
 4.2.1:
+        * fix dependency on chkconfig package on Redhat/CentOS: search
+        /etc/init.d/functions also under /etc/rc.d/init.d/functions
+        (issue reported by Ernie)
         * fix build issue with musl libc (report & patch by A. Kuster)
         * fix case sensitivity (tcp vs TCP, udp vs UDP) in portcheck
@@ -10 +13 @@
         align with documentation
 
-4.2.0:
+4.2.0 (31-10-2016):
         * fix handle tracefs (permission for stat denied) when running
         suidcheck without root privilege (for testing)

trunk/init/samhain.startLinux.in

@@ -40 +40 @@
 # and the command to run them.
 if [ -f /etc/redhat-release ]; then
+    if [ -f /etc/init.d/functions ]; then
         . /etc/init.d/functions
         DISTRO=redhat
+    elif [ -f /etc/rc.d/init.d/functions ]; then
+        . /etc/rc.d/init.d/functions
+        DISTRO=redhat
+    else
+        DISTRO=generic
+    fi
 elif [ -f /etc/mandrake-release ]; then
         . /etc/init.d/functions