Changeset 483

Timestamp:

Sep 1, 2015, 7:38:58 PM (9 years ago)

Author:

katerina

Message:

Fix for ticket #381 (BSD suid check compile failure).

Location:

trunk

Files:

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

trunk/configure.ac

@@ -12 +12 @@
 dnl start
 dnl
-AM_INIT_AUTOMAKE(samhain, 4.0.0.rc1)
+AM_INIT_AUTOMAKE(samhain, 4.1.0)
 AC_DEFINE([SAMHAIN], 1, [Application is samhain])
 AC_CANONICAL_HOST

trunk/docs/Changelog

@@ +1 @@
+4.1.0:
+        * fix missing definition for a sh_dummy_ var on BSD et al.
+        (reported by Andrew)
+
 4.0.0:
+        * fix and document default settings for mounts check
         * new -w CL option to wait on scan completion
         * new option ReportCheckflags

trunk/src/sh_dbIO.c

@@ -413 +413 @@
 }
 
+static void hexdump(unsigned char * data, size_t size)
+{
+  unsigned int count =0;
+  char ith[3];
+
+  do {
+    int2hex(data[count], ith); ith[2] = '\0';
+    printf("%2s", ith);
+    ++count;
+    if (count % 40 == 0) putc('\n', stdout);
+  } while (count < size);
+}
+
 static size_t dbIO_fread_struct (sh_filestore_t * ptr, FILE *stream, 
                                  const char * path, int * errflag)
@@ -440 +453 @@
               char try[5];
 
+              if (1 == 0)
+                hexdump((unsigned char *)&old_struct, sizeof(old_struct));
               memset(&try_struct, '\0', sizeof(try_struct));
               if (!memcmp(&old_struct, &try_struct, sizeof(try_struct)))

trunk/src/sh_suidchk.c

@@ -2347 +2347 @@
    * Avoids the 'clobbered by longjmp' warning. 
    */
-  sh_dummy_type = (void*) &type;
+  sh_dummy_2229_type = (void*) &type;
 
   while (type == NULL
@@ -2367 +2367 @@
    * Avoids the 'clobbered by longjmp' warning. 
    */
-  sh_dummy_type = (void*) &type;
+  sh_dummy_2229_type = (void*) &type;
 
   if (statfs (relpath, &fss, sizeof (struct statfs), 0) == -1)
@@ -2395 +2395 @@
    * Avoids the 'clobbered by longjmp' warning. 
    */
-  sh_dummy_type = (void*) &type;
+  sh_dummy_2229_type = (void*) &type;
 
   if (statvfs (relpath, &fss) == -1)
@@ -2436 +2436 @@
    * Avoids the 'clobbered by longjmp' warning. 
    */
-  sh_dummy_type = (void*) &type;
+  sh_dummy_2229_type = (void*) &type;
 
   if (S_ISLNK (statp->st_mode))