Changeset 59 for trunk/src

Timestamp:

Aug 31, 2006, 9:25:02 PM (18 years ago)

Author:

rainer

Message:

Fix for exit status if database load fails; fix for problem with GrowingLogFiles if signed database is used; better support for *BSD init script installation.

Location:

trunk/src

Files:

• samhain.c (modified) (3 diffs)
• sh_unix.c (modified) (2 diffs)

trunk/src/samhain.c

@@ -652 +652 @@
   sh_files_delfilestack ();
   sh_hash_hashdelete();
+  sh_files_hle_reg (NULL);
 #endif
 #if defined(SH_WITH_SERVER)
@@ -1369 +1370 @@
     }
 
-  /* initialize signal handling etc
-   */
   if (sh.flag.isdaemon == S_TRUE)
     sh_error_only_stderr (BAD);
 
+  /* --- load database; checksum of database
+   */
+#if defined (SH_WITH_CLIENT) || defined (SH_STANDALONE) 
+  TPT((0, FIL__, __LINE__, _("msg=<Get checksum of the database.>\n")))
+  if (sh.flag.checkSum == SH_CHECK_CHECK) 
+    {
+      if (0 != sl_strcmp(file_path('D', 'R'), _("REQ_FROM_SERVER")))
+        {
+          (void) sl_strlcpy(sh.data.hash,
+                            sh_tiger_hash (file_path('D', 'R'), 
+                                           TIGER_FILE, 0), 
+                            KEY_LEN+1);
+        }
+
+      /* this eventually fetches the file from server to get checksum
+       */
+      sh_hash_init ();
+    }
+#endif
+
+  /* --- initialize signal handling etc.; fork daemon
+   */
   if (sh_unix_init(sh.flag.isdaemon) == -1) 
     {
@@ -1409 +1430 @@
 #if defined(INET_SYSLOG) && defined(SH_WITH_SERVER)
   create_syslog_socket (S_FALSE);
-#endif
-
-
-  /* checksum of database
-   */
-#if defined (SH_WITH_CLIENT) || defined (SH_STANDALONE) 
-  TPT((0, FIL__, __LINE__, _("msg=<Get checksum of the database.>\n")))
-  if (sh.flag.checkSum == SH_CHECK_CHECK) 
-    {
-      if (0 == sl_strcmp(file_path('D', 'R'), _("REQ_FROM_SERVER")))
-        {
-          /* fetch the file from server to get checksum
-           */
-          sh_hash_init ();
-          /* sh_hash_hashdelete (); */
-        }
-      else
-        {
-          (void) sl_strlcpy(sh.data.hash,
-                            sh_tiger_hash (file_path('D', 'R'), 
-                                           TIGER_FILE, 0), 
-                            KEY_LEN+1);
-        }
-    }
 #endif
 

trunk/src/sh_unix.c

@@ -2843 +2843 @@
   SL_ENTER(_("sh_unix_checksum_size"));
 
-  /* lookup file in database */
-  status = sh_hash_get_it (filename, &tmpFile);
-  if (status != 0) {
-    goto out;
-  }
+  if (sh.flag.checkSum != SH_CHECK_INIT)
+    {
+      /* lookup file in database */
+      status = sh_hash_get_it (filename, &tmpFile);
+      if (status != 0) {
+        goto out;
+      }
+    }
+  else
+    {
+      tmpFile.size = fbuf->st_size;
+    }
 
   /* if last < current get checksum */
@@ -2853 +2860 @@
     {
       sl_strlcpy(fileHash,
-                sh_tiger_generic_hash (filename, TIGER_FD, tmpFile.size, 
-                                       alert_timeout),
-                KEY_LEN+1);
+                 sh_tiger_generic_hash (filename, TIGER_FD, tmpFile.size, 
+                                        alert_timeout),
+                 KEY_LEN+1);
 
       /* return */