Changeset 424 for trunk

Timestamp:

Jan 13, 2013, 12:17:54 PM (12 years ago)

Author:

katerina

Message:

Fix for ticket #328 (flawed logic in samhain.c)

Location:

trunk

Files:

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

trunk/configure.ac

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

trunk/docs/Changelog

@@ +1 @@
+3.0.10:
+        * Revert to previous logic in samhain.c because it will block
+          otherwise (reported by Alexandr Sabitov)
+
 3.0.9:
         * Fixed a Cygwin compile warning

trunk/src/samhain.c

@@ -1988 +1988 @@
        */
       if      (sh.flag.checkSum == SH_CHECK_INIT ||
+               (sh.flag.inotify & SH_INOTIFY_DOSCAN) != 0 ||
                (sh.flag.checkSum == SH_CHECK_CHECK &&
                 (sh.flag.isdaemon == S_FALSE && sh.flag.loop == S_FALSE)))
@@ -1996 +1997 @@
         }
       else if (sh.flag.checkSum == SH_CHECK_CHECK || 
-               (sh.flag.inotify & SH_INOTIFY_DOSCAN) != 0 ||
                (sh.flag.update == S_TRUE && 
                 (sh.flag.isdaemon == S_TRUE || sh.flag.loop == S_TRUE)))