Merge branch 'master' of ssh://gnunet.org/gnunet

[oweals/gnunet.git] / src / util / configuration_loader.c

diff --git a/src/util/configuration_loader.c b/src/util/configuration_loader.c
index 2caad8c051e72b0459828279ece352c67b9279eb..ceaf2a6ea2f44c71c1419972e29230895b7193b8 100644 (file)
--- a/src/util/configuration_loader.c
+++ b/src/util/configuration_loader.c
@@ -27,7 +27,7 @@
 #include "platform.h"
 #include "gnunet_util_lib.h"
 
-#define LOG(kind,...) GNUNET_log_from (kind, "util", __VA_ARGS__)
+#define LOG(kind,...) GNUNET_log_from (kind, "util-configuration", __VA_ARGS__)
 
 
 /**
@@ -43,8 +43,11 @@ GNUNET_CONFIGURATION_load (struct GNUNET_CONFIGURATION_Handle *cfg,
                            const char *filename)
 {
   char *baseconfig;
+  const char *base_config_varname;
 
-  if (NULL != (baseconfig = getenv ("GNUNET_BASE_CONFIG")))
+  base_config_varname = GNUNET_OS_project_data_get ()->base_config_varname;
+
+  if (NULL != (baseconfig = getenv (base_config_varname)))
   {
     baseconfig = GNUNET_strdup (baseconfig);
   }