Index: trunk/docs/Changelog
===================================================================
--- trunk/docs/Changelog	(revision 353)
+++ trunk/docs/Changelog	(revision 354)
@@ -1,3 +1,6 @@
 2.8.6:
+	* Fix --enable-db-reload option (reported by David L.)
+	* Fix samhain_kmem compilation, need to compile under chosen
+	  name if --enable-install-name is used (reported by David L.)
 	* Fix uninitialized string in error message (reported by mimox)
 
Index: trunk/src/samhain.c
===================================================================
--- trunk/src/samhain.c	(revision 353)
+++ trunk/src/samhain.c	(revision 354)
@@ -1820,4 +1820,14 @@
 #ifdef RELOAD_DATABASE
 	      sh_hash_hashdelete();
+
+	      if (0 != sl_strcmp(file_path('D', 'R'), _("REQ_FROM_SERVER")))
+		{
+		  char hashbuf[KEYBUF_SIZE];
+		  (void) sl_strlcpy(sh.data.hash,
+				    sh_tiger_hash (file_path('D', 'R'), 
+						   TIGER_FILE, TIGER_NOLIM, 
+						   hashbuf, sizeof(hashbuf)), 
+				    KEY_LEN+1);
+		}
 #endif
 	      (void) sl_trust_purge_user();
Index: trunk/src/sh_hash.c
===================================================================
--- trunk/src/sh_hash.c	(revision 353)
+++ trunk/src/sh_hash.c	(revision 354)
@@ -1342,5 +1342,5 @@
 
       sl_strlcpy (sh.data.hash, 
-		  sh_tiger_hash (file_path('C', 'R'),  
+		  sh_tiger_hash (file_path('D', 'R'),  
 				 fd, TIGER_NOLIM, hashbuf, sizeof(hashbuf)),
 		  KEY_LEN+1);
Index: trunk/test/testhash.sh
===================================================================
--- trunk/test/testhash.sh	(revision 353)
+++ trunk/test/testhash.sh	(revision 354)
@@ -58,5 +58,5 @@
 	fi
 	#
-	${TOP_SRCDIR}/configure --quiet $TRUST --prefix=$PW_DIR --localstatedir=$PW_DIR --with-config-file=$RCFILE --with-log-file=$LOGFILE --with-pid-file=$PW_DIR/.samhain_lock --with-data-file=$PW_DIR/.samhain_file --enable-debug '--enable-login-watch' '--enable-mounts-check' ${C_LOGFILE} '--enable-process-check' '--enable-port-check' '--enable-suidcheck' '--with-rnd=unix'
+	${TOP_SRCDIR}/configure --quiet $TRUST --prefix=$PW_DIR --localstatedir=$PW_DIR --with-config-file=$RCFILE --with-log-file=$LOGFILE --with-pid-file=$PW_DIR/.samhain_lock --with-data-file=$PW_DIR/.samhain_file --enable-db-reload --enable-debug '--enable-login-watch' '--enable-mounts-check' ${C_LOGFILE} '--enable-process-check' '--enable-port-check' '--enable-suidcheck' '--with-rnd=unix'
 	#
 	fail=0