Changeset 86 for trunk/src

Timestamp:

Jan 20, 2007, 11:04:59 PM (18 years ago)

Author:

rainer

Message:

More thorough fix for ticket #47, and corresponding regression test.

Location:

trunk/src

Files:

• samhain.c (modified) (3 diffs)
• sh_error.c (modified) (5 diffs)
• sh_gpg.c (modified) (4 diffs)
• sh_prelude.c (modified) (1 diff)
• sh_unix.c (modified) (2 diffs)

trunk/src/samhain.c

@@ -1443 +1443 @@
 
 #if (defined(WITH_GPG) || defined(WITH_PGP))
-  /* do nothing -- we exit earlier if error */
+  /* log startup */
+  sh_gpg_log_startup ();
 #else
   sh_error_handle ((-1), FIL__, __LINE__, 0, MSG_START_1H,
@@ -1465 +1466 @@
     {
 #if (defined(WITH_GPG) || defined(WITH_PGP))
-      /* do nothing -- we exit earlier if error */
+      /* log startup */
+      sh_gpg_log_startup ();
 #else
       sh_error_handle ((-1), FIL__, __LINE__, 0, MSG_START_2H,
@@ -1476 +1478 @@
     {
 #if (defined(WITH_GPG) || defined(WITH_PGP))
-      /* do nothing -- we exit earlier if error */
+      /* log startup */
+      sh_gpg_log_startup ();
 #else
       sh_error_handle ((-1), FIL__, __LINE__, 0, MSG_START_1H,

trunk/src/sh_error.c

@@ -110 +110 @@
 int  OnlyStderr    = S_TRUE; 
 
+/* --- Enable facilities not safe for closeall(). --- 
+ */
+int  enableUnsafe  = S_FALSE;
 
 /*********************************************
@@ -145 +148 @@
 {
   OnlyStderr    = flag;
+  return;
+}
+
+void sh_error_enable_unsafe (int flag)
+{
+  enableUnsafe    = flag;
   return;
 }
@@ -1026 +1035 @@
   /* Full logging enabled.
    */
-  if (OnlyStderr == BAD)  /* full error logging enabled */
+  if (OnlyStderr == S_FALSE)  /* full error logging enabled */
     {
 
@@ -1083 +1092 @@
           class != AUD)
         {
-          if (database_block == 0)
+          if (database_block == 0 && enableUnsafe == S_TRUE)
             {
               /* truncates; query_max is 16k
@@ -1209 +1218 @@
           )
         {
-          if (prelude_block == 0)
+          if (prelude_block == 0 && enableUnsafe == S_TRUE)
             {
               /* will truncate to 998 bytes 

trunk/src/sh_gpg.c

@@ -115 +115 @@
 
 #ifdef GPG_HASH
+
 static int sh_gpg_checksum (SL_TICKET checkfd, int flag)
 {
@@ -202 +203 @@
 }
 #endif
+
+struct startup_info {
+  long   line;
+  char * program;
+  long   uid;
+  char * path;
+  char * key_uid;
+  char * key_id;
+};
+
+static struct startup_info startInfo = { 0, NULL, 0, NULL, NULL, NULL };
+
+void sh_gpg_log_startup ()
+{
+  if (startInfo.program != NULL)
+    {
+      sh_error_handle ((-1), FIL__, startInfo.line, 0, MSG_START_GH,
+                       startInfo.program, startInfo.uid,
+                       startInfo.path,
+                       startInfo.key_uid, startInfo.key_id);
+    }
+  return;
+}
+
+static void sh_gpg_fill_startup (long line, char * program, long uid, char * path, 
+                                 char * key_uid, char * key_id)
+{
+  startInfo.line    = line;
+  startInfo.program = sh_util_strdup(program);
+  startInfo.uid     = uid;
+  startInfo.path    = sh_util_strdup(path);
+  startInfo.key_uid = sh_util_strdup(key_uid);
+  startInfo.key_id  = sh_util_strdup(key_id);
+  return;
+}
 
 static FILE * sh_gpg_popen (sh_gpg_popen_t  *source, int fd, 
@@ -968 +1004 @@
             {
               tmp  = sh_util_safe_name(gp.conf_id);
-              sh_error_handle ((-1), FIL__, __LINE__, 0, MSG_START_GH,
+              sh_gpg_fill_startup (
+                                   /* sh_error_handle ((-1), FIL__, __LINE__, 0, MSG_START_GH, */
                                sh.prg_name, sh.real.uid,
                                (sh.flag.hidefile == S_TRUE) ? 
@@ -995 +1032 @@
         {
           tmp = sh_util_safe_name(gp.conf_id);
-          sh_error_handle ((-1), FIL__, __LINE__, 0, MSG_START_GH,
+          sh_gpg_fill_startup (__LINE__,
+          /* sh_error_handle ((-1), FIL__, __LINE__, 0, MSG_START_GH, */
                            sh.prg_name, sh.real.uid,
                            (sh.flag.hidefile == S_TRUE) ? 

trunk/src/sh_prelude.c

@@ -967 +967 @@
 }
 
-
+/* Allow initialization of prelude; to be called
+ * after forking the daemon. Delays heartbeat
+ * start after config read until it is safe.
+ */
 void sh_prelude_reset(void)
 {

trunk/src/sh_unix.c

@@ -1880 +1880 @@
         }
 
+      sh_error_enable_unsafe (S_TRUE);
 #if defined(HAVE_LIBPRELUDE)
       sh_prelude_reset ();
@@ -1913 +1914 @@
     {
       sh_unix_closeall(3, -1);  /* if not daemon */
+      sh_error_enable_unsafe (S_TRUE);
 #if defined(HAVE_LIBPRELUDE)
       sh_prelude_reset ();