Changeset 460 for trunk

Timestamp:

Nov 1, 2014, 8:17:00 AM (10 years ago)

Author:

katerina

Message:

Better error message for update and fix for deadlock in UNIX entropy collector. 3.1.3 final.

Location:

trunk

Files:

• configure.ac (modified) (1 diff)
• docs/Changelog (modified) (1 diff)
• src/sh_entropy.c (modified) (1 diff)
• src/sh_unix.c (modified) (1 diff)
• test/testrun_2a.sh (modified) (1 diff)

trunk/configure.ac

@@ -12 +12 @@
 dnl start
 dnl
-AM_INIT_AUTOMAKE(samhain, 3.1.2)
+AM_INIT_AUTOMAKE(samhain, 3.1.3)
 AC_DEFINE([SAMHAIN], 1, [Application is samhain])
 AC_CANONICAL_HOST

trunk/docs/Changelog

@@ +1 @@
+3.1.3:
+        * remove initgroups() from the popen call in unix entropy gatherer
+        * Add error message for update mode if local baseline cannot be found
+
 3.1.2:
         * Fixed incorrect memset in sh_checksum.c (sha256)

trunk/src/sh_entropy.c

@@ -614 +614 @@
   
           if (NULL != tempres) {
-            i = setgid(tempres->pw_gid); 
-            if (i == 0)
-              i = sh_unix_initgroups(DEFAULT_IDENT ,tempres->pw_gid);
+            i = setgid(tempres->pw_gid);
+
+            /*** locks up in dnmalloc ***/
+            /*
+             * if (i == 0)
+             *   i = sh_unix_initgroups(DEFAULT_IDENT ,tempres->pw_gid);
+             */
+
             if (i == 0) 
               i = setuid(tempres->pw_uid);

trunk/src/sh_unix.c

@@ -4861 +4861 @@
               SL_RETURN( S_FALSE, _("file_is_remote"));
             }
+          else
+            {
+              char * tmp  = sh_util_safe_name (&(sh.data.path[15]));
+              sh_error_handle((-1), FIL__, __LINE__, S_FALSE, MSG_E_SUBGPATH, 
+                              _("No local baseline database at expected path"), 
+                              _("file_is_remote"),
+                              tmp);
+              SH_FREE(tmp);
+            }
+        }
+      else
+        {
+          sh_error_handle((-1), FIL__, __LINE__, S_FALSE, MSG_E_SUBGEN, 
+                          _("No local baseline database path known"), 
+                          _("file_is_remote"));
         }
       SL_RETURN( S_TRUE, _("file_is_remote"));

trunk/test/testrun_2a.sh

@@ -252 +252 @@
         [ -z "$quiet" ] && log_fail 1 ${MAXTEST} "Client download+logging";
     fi
+    ####### EXIT HERE FOR TESTING ######
+    #
+    exit 0
     #
     SERVER_BUILDOPTS_ORIG="${SERVER_BUILDOPTS}"