Merge branch 'collectd-5.4' into collectd-5.5

[collectd.git] / src / daemon / collectd.c

diff --git a/src/daemon/collectd.c b/src/daemon/collectd.c
index 88c38ac..ad06999 100644 (file)
--- a/src/daemon/collectd.c
+++ b/src/daemon/collectd.c
@@ -302,6 +302,11 @@ static int do_init (void)
 #if HAVE_SETLOCALE
        if (setlocale (LC_NUMERIC, COLLECTD_LOCALE) == NULL)
                WARNING ("setlocale (\"%s\") failed.", COLLECTD_LOCALE);
+
+       /* Update the environment, so that libraries that are calling
+        * setlocale(LC_NUMERIC, "") don't accidentally revert these changes. */
+       unsetenv ("LC_ALL");
+       setenv ("LC_NUMERIC", COLLECTD_LOCALE, /* overwrite = */ 1);
 #endif
 
 #if HAVE_LIBKSTAT