Changeset 105 for trunk

Timestamp:

May 15, 2007, 10:56:55 PM (18 years ago)

Author:

rainer

Message:

Fixes for tickets #64, #65, #66 (null checksum encoding, acl double print, UseACLCheck/UseSELinuxCheck bug).

Location:

trunk

Files:

• docs/Changelog (modified) (1 diff)
• include/samhain.h (modified) (1 diff)
• src/sh_hash.c (modified) (2 diffs)
• src/sh_tiger0.c (modified) (1 diff)
• src/sh_unix.c (modified) (3 diffs)

trunk/docs/Changelog

@@ +1 @@
+2.3.5:
+        * fix incorrect encoding of null checksums in stealth mode
+        * sh_hash.c: fix repeated printing of acl/attributes in database dump
+        * sh_unix.c: fix option useaclcheck ignored if both useaclcheck and 
+          useselinuxcheck are supported
+
 2.3.4:
         * sh_processcheck.c: fix missing init of sh_prochk_res array before 

trunk/include/samhain.h

@@ -125 +125 @@
 };
 
-#define SH_KEY_NULL _("000000000000000000000000000000000000000000000000")
 
 /**************************************************

trunk/src/sh_hash.c

@@ -61 +61 @@
 #include "sh_forward.h"
 #endif
+
+
+#define SH_KEY_NULL _("000000000000000000000000000000000000000000000000")
+
 
 #undef  FIL__
@@ -3568 +3572 @@
             SH_FREE(esc);
         }
-      printf(_(" %s"), tmp);
       SH_FREE(tmp);
     }

trunk/src/sh_tiger0.c

@@ -54 +54 @@
 
 typedef unsigned char sh_byte;
+
+#define SH_KEY_NULL _("000000000000000000000000000000000000000000000000")
 
 #undef  FIL__

trunk/src/sh_unix.c

@@ -139 +139 @@
 #endif
 
+#define SH_KEY_NULL _("000000000000000000000000000000000000000000000000")
 
 #undef  FIL__
@@ -3040 +3041 @@
 #endif
 
-  out = sh_unix_getinfo_xattr_int(path, fd, _("security.selinux"));
-
-  if (out)
-    {
-      if (collect) {
-        tmp = sh_util_strconcat(_("selinux:"), out, ":", collect, NULL);
-        SH_FREE(collect);
-      }
-      else {
-        tmp = sh_util_strconcat(_("selinux:"), out, NULL);
-      }
-      SH_FREE(out);
-      collect = tmp;
+  if (sh_unix_check_selinux == S_TRUE)
+    {
+      out = sh_unix_getinfo_xattr_int(path, fd, _("security.selinux"));
+
+      if (out)
+        {
+          if (collect) {
+            tmp = sh_util_strconcat(_("selinux:"), out, ":", collect, NULL);
+            SH_FREE(collect);
+          }
+          else {
+            tmp = sh_util_strconcat(_("selinux:"), out, NULL);
+          }
+          SH_FREE(out);
+          collect = tmp;
+        }
     }
 
@@ -3321 +3325 @@
 #endif
 
-#if defined(USE_XATTR)
+#if defined(USE_XATTR) && defined(USE_ACL)
+  if (sh_unix_check_selinux == S_TRUE || sh_unix_check_acl == S_TRUE)
+    theFile->attr_string = sh_unix_getinfo_xattr (theFile->fullpath, fd, &buf);
+#elif defined(USE_XATTR)
   if (sh_unix_check_selinux == S_TRUE)
     theFile->attr_string = sh_unix_getinfo_xattr (theFile->fullpath, fd, &buf);