add ARKIME_default__ support for env vars (arkime#3052)

mmguero-dev · Dec 6, 2024 · fdf5616 · fdf5616
1 parent d723c9f
commit fdf5616
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -39,6 +39,7 @@ NOTICE: Create a parliament config file before upgrading (see https://arkime.com
   - #3037 remove babel
 ## Capture
   - #3046 added packet-stats command
+  - #3052 add ARKIME_default__ support for env vars
 
 5.5.1 2024/11/20
 ## Release

diff --git a/capture/config.c b/capture/config.c
@@ -1424,16 +1424,17 @@ void arkime_config_init()
 {
     extern char **environ;
     for (int e = 0; environ[e]; e++) {
-        if (strncmp(environ[e], "ARKIME__", 8) == 0) {
-            const char *equal = strchr(environ[e] + 8, '=');
+        if (strncmp(environ[e], "ARKIME__", 8) == 0 || strncmp(environ[e], "ARKIME_default__", 16) == 0) {
+            int offset = environ[e][7] == '_' ? 8 : 16;
+            const char *equal = strchr(environ[e] + offset, '=');
             if (!equal)
                 continue;
 
             if (!config.override) {
                 config.override = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free);
             }
 
-            char *key = g_strndup(environ[e] + 8,  equal - environ[e] - 8);
+            char *key = g_strndup(environ[e] + offset,  equal - environ[e] - offset);
             if (g_hash_table_contains(config.override, key)) {
                 g_free(key);
             } else {