Changeset 421

Timestamp:

Nov 25, 2012, 1:44:37 PM (12 years ago)

Author:

katerina

Message:

Fix for ticket #325 (samhainctl probe command).

Location:

trunk

Files:

• docs/Changelog (modified) (1 diff)
• src/sh_socket.c (modified) (4 diffs)

trunk/docs/Changelog

@@ -1 +1 @@
 3.0.9:
+        * Fix the probe command (misses clients if their startup message
+          has been missed)
         * Fix the RPM spec file for --enable-network=client and no password
           (reported by Mitch St Martin)

trunk/src/sh_socket.c

@@ -165 +165 @@
 #include "sh_utils.h"
 
-
+/* The reload list stores information about
+ * reloads confirmed by clients (startup and/or
+ * runtime cinfiguration reloaded).
+ */
 struct reload_cmd {
   char          clt[SH_MAXMSGLEN];
@@ -235 +238 @@
       if (item->status_now != CLT_INACTIVE)
         {
+          int flag = 0;
+
           file = get_client_conf_file (item->hostname, &dummy);
 
@@ -250 +255 @@
                   if (0 == sl_strcmp(new->clt, item->hostname))
                     {
+                      flag = 1; /* Client is in list already */
+
 #ifdef SH_DEBUG_SOCKET
                       fprintf(stderr, "%lu <> %lu\n", 
@@ -266 +273 @@
                   new = new->next;
                 }
-            }
-        }
-    }
+
+              if (flag == 0)
+                {
+                  /* client is active, but start message has been missed; reload 
+                   */
+                  sl_strlcpy(cmd.cmd, _("RELOAD"),    SH_MAXMSGLEN);
+                  sl_strlcpy(cmd.clt, item->hostname, SH_MAXMSGLEN);
+                  sh_socket_add2list (&cmd);
+
+                  /* Add the client to the reload list and set
+                   * time to 0, since we don't know the startup time.
+                   */
+                  sh_socket_add2reload (item->hostname);
+                  new = reloadlist;
+                  while (new)
+                    {
+                      if (0 == sl_strcmp(new->clt, item->hostname))
+                        {
+                          new->cti = 0;
+                          break;
+                        }
+                      new = new->next;
+                    }
+                }
+            } /* if stat(file).. */
+        } /* if !CLT_INACTIVE */
+    } /* loop over clients */
   return;
 }