Changeset 487 for trunk

Timestamp:

Sep 13, 2015, 11:15:42 AM (9 years ago)

Author:

katerina

Message:

Fix for ticket #385 (self_test not working with exit on sigterm).

Location:

trunk

Files:

• docs/Changelog (modified) (1 diff)
• src/samhain.c (modified) (1 diff)
• src/sh_unix.c (modified) (1 diff)
• test/testhash.sh (modified) (1 diff)

trunk/docs/Changelog

@@ -1 +1 @@
 4.1.0:
-        * fix safe_logger() - uses the logger utility with a non-posix option 
+        * fix call of self_check for exit on sigterm
+        * fix safe_logger() - uses the logger utility with a non-posix option
         * fix missing reporting on shell expansion capability in --version
         * fix missing error message on invalid list for skipchecksum

trunk/src/samhain.c

@@ -797 +797 @@
   /* --- Checksum of executable. ---
    */
-  (void) sh_unix_self_check();
+  {
+    volatile  int sig_store = sig_termfast;
+
+    sig_termfast = 0;
+    (void) sh_unix_self_check();
+    sig_termfast = sig_store;
+  }
 
 

trunk/src/sh_unix.c

@@ -969 +969 @@
              sh_tiger_hash (sh.exec.path, TIGER_FILE, TIGER_NOLIM, hashbuf, sizeof(hashbuf)), 
              KEY_LEN+1);
-  if (0 == sl_strncmp(sh.exec.hash, 
-                      newhash,
-                      KEY_LEN))
-    SL_RETURN((0), _("sh_unix_self_check"));
-
+  if (0 == sl_strncmp(sh.exec.hash, newhash, KEY_LEN))
+    {
+      sh_error_handle(SH_ERR_INFO, FIL__, __LINE__, 0, MSG_E_SUBGEN,
+                      _("Checksum ok"), _("sh_unix_self_check"));
+      SL_RETURN((0), _("sh_unix_self_check"));
+    }
  
   dlog(1, FIL__, __LINE__, 

trunk/test/testhash.sh

@@ -63 +63 @@
         fi
         #
-        ${TOP_SRCDIR}/configure --enable-debug=gdb --quiet $TRUST --prefix=$PW_DIR --localstatedir=$PW_DIR --with-config-file=$RCFILE --with-log-file=$LOGFILE --with-pid-file=$PW_DIR/.samhain_lock --with-data-file=$PW_DIR/.samhain_file --enable-db-reload '--enable-login-watch' '--enable-mounts-check' ${C_LOGFILE} '--enable-port-check' '--enable-suidcheck' '--enable-message-queue'
+        ${TOP_SRCDIR}/configure --enable-debug=gdb --quiet $TRUST --prefix=$PW_DIR --localstatedir=$PW_DIR --with-config-file=$RCFILE --with-log-file=$LOGFILE --with-pid-file=$PW_DIR/.samhain_lock --with-data-file=$PW_DIR/.samhain_file --enable-db-reload '--enable-login-watch' '--enable-mounts-check' ${C_LOGFILE} '--enable-port-check' '--enable-message-queue'
         #
         fail=0