Changeset 354 for trunk/src

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/src

Files:

• samhain.c (modified) (1 diff)
• sh_hash.c (modified) (1 diff)

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);