Changeset 279 for trunk/configure.ac

Timestamp:

Apr 30, 2010, 11:55:18 PM (15 years ago)

Author:

katerina

Message:

Fix for tickets #200 to #206 (kernel check, login checks, bugfixes).

File:

• trunk/configure.ac (modified) (6 diffs)

trunk/configure.ac

@@ -12 +12 @@
 dnl start
 dnl
-AM_INIT_AUTOMAKE(samhain, 2.6.4)
+AM_INIT_AUTOMAKE(samhain, 2.7.0)
 AC_DEFINE([SAMHAIN], 1, [Application is samhain])
 AC_CANONICAL_HOST
@@ -63 +63 @@
            i*86*)
            AC_DEFINE(HOST_IS_I86LINUX)
+           ;;
+           x86_64)
+           AC_DEFINE([HOST_IS_64LINUX], 1, [Define if host OS is 64bit Linux])
            ;;
            *)
@@ -2020 +2023 @@
         ]
 )
-AC_SUBST(lkm_inc)
-AC_SUBST(sh_lkm)
-AC_SUBST(sh_insmod_cmd)
+
 AC_SUBST(install_name)
 AC_SUBST(INSTALL_NAME)
@@ -2064 +2065 @@
                 kernelversion=`uname -r`
                 AC_DEFINE_UNQUOTED(SH_KERNEL_VERSION, _("${kernelversion}"), [Define the kernel version])
+
                 if test "x${withval}" != "xyes"; then
                         systemmap="${withval}"
                 fi
+
                 if test "x${cross_compiling}" = xyes; then
                         :
@@ -2072 +2075 @@
                         LIBS="$LIBS -lkvm"
                         sh_libkvm="-lkvm"
-                elif test -f "${systemmap}"; then 
-                        :
+                elif test -f "${systemmap}"; then
+                        if test -f /dev/kmem; then 
+                           :
+                        else
+                           # need kernel module
+
+                           if test -f /lib/modules/${kernelversion}/build/include/linux/kernel.h; then
+                              lkm_inc="-I/lib/modules/${kernelversion}/build/include"
+                           else
+                               AC_MSG_WARN([--enable-khide: /lib/modules/${kernelversion}/build/include/linux not found])
+                               AC_MSG_WARN([--enable-khide: You may need to install the kernel-source])
+                               AC_MSG_WARN([--enable-khide: headers for the currently-running kernel.])
+                           fi
+
+                           AC_MSG_CHECKING([for vmlist_lock])
+                           sh_vmlist_lock=`egrep ['[bdBD] vmlist_lock$'] ${systemmap} | awk '{print $1}'` 
+                           if test x"$sh_vmlist_lock" = x; then 
+                               AC_MSG_RESULT(no)
+                           else
+                               sh_vmlist_lock="0x${sh_vmlist_lock}"
+                               AC_MSG_RESULT([${sh_vmlist_lock}])
+                               AC_DEFINE_UNQUOTED(SH_VMLIST_LOCK, ${sh_vmlist_lock}, [The address of the vmlist spinlock])
+                           fi
+
+                           AC_MSG_CHECKING([for vmlist])
+                           sh_vmlist_lock=`egrep ['[bdBD] vmlist$'] ${systemmap} | awk '{print $1}'` 
+                           if test x"$sh_vmlist" = x; then 
+                               AC_MSG_RESULT(no)
+                           else
+                               sh_vmlist="0x${sh_vmlist}"
+                               AC_MSG_RESULT([${sh_vmlist}])
+                               AC_DEFINE_UNQUOTED(SH_VMLIST, ${sh_vmlist}, [The address of the vmlist])
+                           fi
+
+                           sh_lkm="${sh_lkm} samhain_kmem.ko"
+                           echo "${sh_insmod_cmd}" | grep 'no kernel module' >/dev/null
+                           if [ $? -eq 0 ]; then
+                              sh_insmod_cmd="modprobe ${install_name}_kmem"
+                           else
+                              sh_insmod_cmd="modprobe ${install_name}_kmem; ${sh_insmod_cmd}"
+                           fi
+                        fi
                 else
                         AC_MSG_ERROR([Option --with-kcheck=systemmap cannot be used, because system map ${systemmap} does not exist.])
@@ -2080 +2123 @@
         ]
 )
+
+AC_SUBST(lkm_inc)
+AC_SUBST(sh_lkm)
+AC_SUBST(sh_insmod_cmd)
+
 AC_SUBST(systemmap)
 AC_SUBST(sh_libkvm)