Index: /trunk/configure.ac
===================================================================
--- /trunk/configure.ac	(revision 459)
+++ /trunk/configure.ac	(revision 460)
@@ -12,5 +12,5 @@
 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
Index: /trunk/docs/Changelog
===================================================================
--- /trunk/docs/Changelog	(revision 459)
+++ /trunk/docs/Changelog	(revision 460)
@@ -1,2 +1,6 @@
+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)
Index: /trunk/src/sh_entropy.c
===================================================================
--- /trunk/src/sh_entropy.c	(revision 459)
+++ /trunk/src/sh_entropy.c	(revision 460)
@@ -614,7 +614,12 @@
   
 	  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);
Index: /trunk/src/sh_unix.c
===================================================================
--- /trunk/src/sh_unix.c	(revision 459)
+++ /trunk/src/sh_unix.c	(revision 460)
@@ -4861,4 +4861,19 @@
 	      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"));
Index: /trunk/test/testrun_2a.sh
===================================================================
--- /trunk/test/testrun_2a.sh	(revision 459)
+++ /trunk/test/testrun_2a.sh	(revision 460)
@@ -252,4 +252,7 @@
 	[ -z "$quiet" ] && log_fail 1 ${MAXTEST} "Client download+logging";
     fi
+    ####### EXIT HERE FOR TESTING ######
+    #
+    exit 0
     #
     SERVER_BUILDOPTS_ORIG="${SERVER_BUILDOPTS}"