Changeset 277 for trunk

Timestamp:

Mar 22, 2010, 9:02:38 PM (15 years ago)

Author:

katerina

Message:

Fix for bug in kernel check (ticket #198).

Location:

trunk

Files:

• configure.ac (modified) (1 diff)
• docs/Changelog (modified) (1 diff)
• src/sh_kern.c (modified) (2 diffs)
• src/sh_log_check.c (modified) (1 diff)

trunk/configure.ac

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

trunk/docs/Changelog

@@ -1 +1 @@
 2.6.4:
+        * Don't read proc_root_iops in sh_kern.c (Problem report
+          by H. R.)
+        * Logfile check can check output of shell commands
         * Use data directory as default for logfile checkpoints
+        * Fix broken checkpoint save/restore for logfiles
 
 2.6.3:

trunk/src/sh_kern.c

@@ -658 +658 @@
                              sizeof(proc_root_dir)))
         status = -7;
+    }
+/* 2.6.21 (((2) << 16) + ((6) << 8) + (21)) */
+#if SH_KERNEL_NUMBER < 132629
+  if(status == 0)
+    {
       if (sh_kern_read_data (kd, proc_root_iops, 
                              (unsigned char *) &proc_root_inode, 
@@ -663 +668 @@
         status = -8;
     }
+#else
+  memset(&proc_root_inode, '\0', sizeof(proc_root_inode));
+#endif
   
   /*

trunk/src/sh_log_check.c

@@ -896 +896 @@
       status = (int) sh_string_read(s, logfile->fp, 8192);
 
-      fprintf(stderr, "FIXME: %s\n", sh_string_str(s));
+      /* fprintf(stderr, "FIXME: %s\n", sh_string_str(s)); */
 
       /* restore old signal handler