Cannot use String as a global due to memory pool dependencies.

diff --git a/src/globals.h b/src/globals.h
index d31242ab2833a85d11e0bf553f10b616eb72a72a..d912d20d13e0062cbd22e632c2cc623ca1f5b24c 100644 (file)
--- a/src/globals.h
+++ b/src/globals.h
@@ -173,7 +173,7 @@ extern "C" {
     extern const char *external_acl_message;      /* NULL */
     extern int opt_send_signal;        /* -1 */
     extern int opt_no_daemon; /* 0 */
-    extern String KidName; /* APP_SHORTNAME */
+    extern char KidName[NAME_MAX];
     extern int KidIdentifier; /* 0 */
 
 

diff --git a/src/main.cc b/src/main.cc
index 2d5335b929c807703de47f2f0625a723b0852f9c..7a867bafdd7aaf13b06b38e20d612058fa376a33 100644 (file)
--- a/src/main.cc
+++ b/src/main.cc
@@ -1158,10 +1158,12 @@ ConfigureCurrentKid(const char *processName)
         if (const char *idStart = strrchr(processName, '-')) {
             KidIdentifier = atoi(idStart + 1);
             const int nameLen = idStart - (processName + 1);
-                       KidName.limitInit(processName + 1, nameLen);
+            xstrncpy(KidName, processName + 1, nameLen + 1);
         }
+    } else {
+        xstrncpy(KidName, APP_SHORTNAME, sizeof(KidName));
+        KidIdentifier = 0;
     }
-    // else use defaults, but it should not happen except for the main process
 }
 
 int