exchange

commit adf854cd4a2e337f67493bd169e403d41db69444
parent b83ec3a794d9ef8fbd689fdf1955acac7af0684d
Author: Florian Dold <florian@dold.me>
Date:   Wed,  4 Aug 2021 21:49:21 +0200

load config file from correct location

Diffstat:
M
src/auditor/taler-auditor-exchange.c
 | 
8
+++++++-
M
src/auditor/taler-auditor-httpd.c
 | 
8
+++++++-
M
src/benchmark/taler-bank-benchmark.c
 | 
9
+++++++--
M
src/benchmark/taler-exchange-benchmark.c
 | 
9
+++++++--
M
src/exchange/taler-exchange-httpd.c
 | 
9
++++++++-

5 files changed, 36 insertions(+), 7 deletions(-)
diff --git a/src/auditor/taler-auditor-exchange.c b/src/auditor/taler-auditor-exchange.c
@@ -104,7 +104,13 @@ main (int argc,
       return EXIT_INVALIDARGUMENT;
   }
   if (NULL == cfgfile)
-    cfgfile = GNUNET_strdup (GNUNET_OS_project_data_get ()->user_config_file);
+    cfgfile = GNUNET_CONFIGURATION_default_filename ();
+  if (NULL == cfgfile)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Can't find default configuration file.\n");
+    return EXIT_NOTCONFIGURED;
+  }
   cfg = GNUNET_CONFIGURATION_create ();
 
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
diff --git a/src/auditor/taler-auditor-httpd.c b/src/auditor/taler-auditor-httpd.c
@@ -591,7 +591,13 @@ main (int argc,
                                    (NULL == loglev) ? "INFO" : loglev,
                                    logfile));
   if (NULL == cfgfile)
-    cfgfile = GNUNET_strdup (GNUNET_OS_project_data_get ()->user_config_file);
+    cfgfile = GNUNET_CONFIGURATION_default_filename ();
+  if (NULL == cfgfile)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Can't find default configuration file.\n");
+    return EXIT_NOTCONFIGURED;
+  }
   cfg = GNUNET_CONFIGURATION_create ();
   if (GNUNET_SYSERR ==
       GNUNET_CONFIGURATION_load (cfg,
diff --git a/src/benchmark/taler-bank-benchmark.c b/src/benchmark/taler-bank-benchmark.c
@@ -775,8 +775,13 @@ main (int argc,
     return BAD_CONFIG_FILE;
   }
   if (NULL == cfg_filename)
-    cfg_filename = GNUNET_strdup (
-      GNUNET_OS_project_data_get ()->user_config_file);
+    cfg_filename = GNUNET_CONFIGURATION_default_filename ();
+  if (NULL == cfg_filename)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Can't find default configuration file.\n");
+    return EXIT_NOTCONFIGURED;
+  }
   cfg = GNUNET_CONFIGURATION_create ();
   if (GNUNET_OK !=
       GNUNET_CONFIGURATION_load (cfg,
diff --git a/src/benchmark/taler-exchange-benchmark.c b/src/benchmark/taler-exchange-benchmark.c
@@ -990,8 +990,13 @@ main (int argc,
     return BAD_CONFIG_FILE;
   }
   if (NULL == cfg_filename)
-    cfg_filename = GNUNET_strdup (
-      GNUNET_OS_project_data_get ()->user_config_file);
+    cfg_filename = GNUNET_CONFIGURATION_default_filename ();
+  if (NULL == cfg_filename)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Can't find default configuration file.\n");
+    return EXIT_NOTCONFIGURED;
+  }
   cfg = GNUNET_CONFIGURATION_create ();
   if (GNUNET_OK !=
       GNUNET_CONFIGURATION_load (cfg,
diff --git a/src/exchange/taler-exchange-httpd.c b/src/exchange/taler-exchange-httpd.c
@@ -1688,7 +1688,14 @@ main (int argc,
   GNUNET_free (loglev);
   GNUNET_free (logfile);
   if (NULL == cfgfile)
-    cfgfile = GNUNET_strdup (GNUNET_OS_project_data_get ()->user_config_file);
+    cfgfile = GNUNET_CONFIGURATION_default_filename ();
+  if (NULL == cfgfile)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Can't find default configuration file.\n");
+    return EXIT_NOTCONFIGURED;
+  }
+
   TEH_cfg = GNUNET_CONFIGURATION_create ();
   if (GNUNET_SYSERR ==
       GNUNET_CONFIGURATION_load (TEH_cfg,