Changeset 487 for trunk/src

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/src

Files:

• samhain.c (modified) (1 diff)
• sh_unix.c (modified) (1 diff)

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__,