Changeset 564 for trunk

Timestamp:

Jun 30, 2021, 10:29:32 PM (3 years ago)

Author:

katerina

Message:

Fix for ticket #452 (reproducible database generation).

Location:

trunk

Files:

• config.h.in (modified) (1 diff)
• configure.ac (modified) (3 diffs)
• docs/Changelog (modified) (1 diff)
• src/sh_dbIO.c (modified) (1 diff)
• src/sh_files.c (modified) (5 diffs)

trunk/config.h.in

@@ -770 +770 @@
 /* Define if you have SA_SIGINFO */
 #undef HAVE_SA_SIGINFO
+
+/* Define to 1 if you have the `scandir' function. */
+#undef HAVE_SCANDIR
 
 /* Define to 1 if you have the <sched.h> header file. */

trunk/configure.ac

@@ -12 +12 @@
 dnl start
 dnl
-AM_INIT_AUTOMAKE(samhain, 4.4.3)
+AM_INIT_AUTOMAKE(samhain, 4.4.4)
 AC_DEFINE([SAMHAIN], 1, [Application is samhain])
 AC_CANONICAL_HOST
@@ -391 +391 @@
         strerror_r getgrgid_r getpwnam_r getpwuid_r \
         gmtime_r localtime_r rand_r readdir_r strtok_r \
-        mincore posix_fadvise inotify_init1
+        mincore posix_fadvise inotify_init1 scandir
 )
 AC_CHECK_FUNC(statfs, AC_DEFINE(HAVE_STATFS) statfs="yes",  statfs="no")
@@ -1140 +1140 @@
 # this is from the snort configure.in
 #
-AC_DEFUN(FAIL_MESSAGE,[
+AC_DEFUN([FAIL_MESSAGE],[
    echo 
    echo

trunk/docs/Changelog

@@ -3 +3 @@
         * fix bug with signify-openbsd in client/server setup (reported
         by Sdoba)
+        * patch by K. Hacene for reproducible database generation
+        * fix recognition of invalid compiler options in configure.ac
 
 4.4.3:

trunk/src/sh_dbIO.c

@@ -1512 +1512 @@
         }
     }
-         
-  if (!buf) {
-    memset(&p, 0, sizeof(sh_filestore_t));
-  }
+
+  /* unconditionally initialize the structure */
+  memset(&p, 0, sizeof(sh_filestore_t));
 
   if (buf != NULL) 

trunk/src/sh_files.c

@@ -20 +20 @@
 #include "config_xor.h"
 
-#if defined(HAVE_PTHREAD_MUTEX_RECURSIVE)
+#if defined(HAVE_PTHREAD_MUTEX_RECURSIVE) && defined(HAVE_DIRENT_H) && defined(HAVE_SCANDIR)
+
+/* Linux */
+#if defined(__linux__)
+#define _XOPEN_SOURCE 700
+#define SH_USE_SCANDIR 1
+
+/* FreeBSD */
+#elif defined(__FreeBSD__)
+
+#if __FreeBSD__ >= 8
+#define __XSI_VISIBLE 700
+#define SH_USE_SCANDIR 1
+#endif
+
+/* OpenBSD */
+#elif defined(__OpenBSD__)
+#define __POSIX_VISIBLE 200809
+#define SH_USE_SCANDIR 1
+
+#elif defined(__NetBSD__)
+#define _NETBSD_SOURCE
+#define SH_USE_SCANDIR 1
+
+/* other os */
+#else
+#define _XOPEN_SOURCE 500
+
+#endif
+
+#elif defined(HAVE_PTHREAD_MUTEX_RECURSIVE)
 #define _XOPEN_SOURCE 500
 #endif
@@ -36 +66 @@
 #include <sys/types.h>
 #include <unistd.h>
-#include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
@@ -2081 +2110 @@
   DIR *           thisDir = NULL;
   struct dirent * thisEntry;
+#if defined(SH_USE_SCANDIR)
+  struct dirent **entryList;
+  int             entry;
+#endif
   int             status;
   int             dummy = S_FALSE;
@@ -2267 +2300 @@
   dirlist_orig = NULL;
 
+#if defined(SH_USE_SCANDIR)
+  entry = scandir(iname, &entryList, 0, alphasort);
+  while(entry > 0) { /* scandir() may return -1 on error! */
+      entry--;
+      thisEntry = entryList[entry];
+#else
   do {
       thisEntry = readdir (thisDir);
+#endif
       if (thisEntry != NULL) 
         {
@@ -2284 +2324 @@
           dirlist = addto_sh_dirlist (thisEntry, dirlist);
         }
-  } while (thisEntry != NULL);
-
+  }
+#if !defined(SH_USE_SCANDIR)  
+  while (thisEntry != NULL);
+#endif
+  
   SH_MUTEX_UNLOCK(mutex_readdir);