Changeset 354

Timestamp:

Aug 24, 2011, 8:37:24 PM (13 years ago)

Author:

katerina

Message:

Fix for ticket #259 (option --enable-db-reload broken).

Location:

trunk

Files:

• docs/Changelog (modified) (1 diff)
• src/samhain.c (modified) (1 diff)
• src/sh_hash.c (modified) (1 diff)
• test/testhash.sh (modified) (1 diff)

trunk/docs/Changelog

@@ -1 +1 @@
 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)
 

trunk/src/samhain.c

@@ -1820 +1820 @@
 #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();

trunk/src/sh_hash.c

@@ -1342 +1342 @@
 
       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);

trunk/test/testhash.sh

@@ -58 +58 @@
         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