Changeset 91

Timestamp:

Feb 17, 2007, 9:47:38 PM (18 years ago)

Author:

rainer

Message:

Slightly improved fix for samhain_hide module.

Location:

trunk

Files:

• configure.ac (modified) (1 diff)
• docs/FAQ.html (modified) (2 diffs)
• docs/HOWTO-client+server-troubleshooting.html (modified) (1 diff)
• src/samhain_hide.c (modified) (5 diffs)
• test/testcompile.sh (modified) (1 diff)

trunk/configure.ac

@@ -1744 +1744 @@
            # -- NEW --
            kernel_version=`uname -r | sed s,2.6.*,LINUX26,`
-           kernel_numeric=`uname -r | sed 's%-%.%' | sed 's%_%.%' | awk -F. '{ print $1*100000+$2*1000+$3 }'`
+           kernel_numeric=`uname -r | sed 's%-%.%g' | sed 's%_%.%g' | awk -F. '{ print $1*65536+$2*256+$3 }'`
            AC_DEFINE_UNQUOTED(SH_KERNEL_NUMERIC, ${kernel_numeric}, [Kernel number])
 

trunk/docs/FAQ.html

@@ -31 +31 @@
 div.warnblock {
         background: #b6c5f2; color: #000;
+        background: #ffffcc; color: #000;
         margin: 1em; padding: 0 1em 0 1em;
         border-width: 1px;
@@ -129 +130 @@
 <br><center><h2>Rainer Wichmann</h2></center>
 <hr>
-<p><i>FAQ Revised: Monday 11 September 2006 22:18:54</i></p>
+<div class="warnblock">
+<ul>
+  <li>If you encounter problems after installing samhain, disable daemon
+      mode and run it in the foreground with 
+      <tt>samhain --foreground [more options]</tt> for debugging.</li>
+  <li>If you have problems getting client/server mode to work, please check
+      the <a href="http://www.la-samhna.de/samhain/HOWTO-client+server-troubleshooting.html">HOWTO client+server troubleshooting</a> document.</li>
+</ul>
+</div>
+<p><i>FAQ Revised: Monday 12 February 2007 23:06:43</i></p>
 <hr><h2>Table of Contents</h2>
 <dl>

trunk/docs/HOWTO-client+server-troubleshooting.html

@@ -139 +139 @@
       stop the server, then run it in the foreground with 
       <tt>yule -p info --foreground</tt></li>
+</ul>
 </div>
 <p>

trunk/src/samhain_hide.c

@@ -119 +119 @@
 /* The configure options (#defines) for the Kernel
  */
-#if SH_KERNEL_NUMERIC >= 206019
+/* 2.6.19 (((2) << 16) + ((6) << 8) + (19)) */
+#define SH_KERNEL_MIN 132627 
+
+#if SH_KERNEL_NUMERIC >= SH_KERNEL_MIN
 #include <linux/autoconf.h>
 #else
@@ -169 +172 @@
 #include <linux/smp_lock.h>
 
-#if SH_KERNEL_NUMERIC >= 206019
+#if SH_KERNEL_NUMERIC >= SH_KERNEL_MIN
 #include <linux/mutex.h>
 #endif
@@ -783 +786 @@
     spinlock_t * modlist_lock = (spinlock_t * ) SH_MODLIST_LOCK;
 #endif
-#if SH_KERNEL_NUMERIC >= 206019
+#if SH_KERNEL_NUMERIC >= SH_KERNEL_MIN
     struct mutex * module_mutex = (struct mutex *) SH_MODLIST_MUTEX;
 #endif
@@ -789 +792 @@
     struct module *mod;
 
-#if SH_KERNEL_NUMERIC >= 206019
+#if SH_KERNEL_NUMERIC >= SH_KERNEL_MIN
     mutex_lock(module_mutex);
 #endif
@@ -807 +810 @@
 #endif
     }
-#if SH_KERNEL_NUMERIC >= 206019
+#if SH_KERNEL_NUMERIC >= SH_KERNEL_MIN
       mutex_unlock(module_mutex);
 #endif

trunk/test/testcompile.sh

@@ -45 +45 @@
 
     if [ "x$3" = "xdebug" ]; then memcheck=debug; else memcheck=simple; fi
-    if [ -f ../sm_scripts/smatch.pm ]; then
+    if [ -f ../../static/sm_scripts/smatch.pm ]; then
         ( 
-            cd ../sm_scripts;
+            cd ../../static/sm_scripts;
             
             for i in ${CDIR}/*.c.sm ; do