[taler-exchange] branch master updated (b83ec3a7 -> 1ca52138)

[gnunet]

This is an automated email from the git hooks/post-receive script.

dold pushed a change to branch master
in repository exchange.

    from b83ec3a7 fixme
     new adf854cd load config file from correct location
     new 1ca52138 debian: bump version

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/changelog                         | 8 +++++++-
 src/auditor/taler-auditor-exchange.c     | 8 +++++++-
 src/auditor/taler-auditor-httpd.c        | 8 +++++++-
 src/benchmark/taler-bank-benchmark.c     | 9 +++++++--
 src/benchmark/taler-exchange-benchmark.c | 9 +++++++--
 src/exchange/taler-exchange-httpd.c      | 9 ++++++++-
 6 files changed, 43 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6d7c2f3d..db85dffa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,12 @@
+taler-exchange (0.9.0-26) unstable; urgency=low
+
+  * Search config file location correctly.
+
+ -- Florian Dold <dold@taler.net>  Wed, 04 Aug 2021 21:49:42 +0200
+
 taler-exchange (0.9.0-25) unstable; urgency=low
 
-  * Socket permissions
+  * Socket permissions.
 
  -- Florian Dold <dold@taler.net>  Wed, 04 Aug 2021 20:54:31 +0200
 
diff --git a/src/auditor/taler-auditor-exchange.c 
b/src/auditor/taler-auditor-exchange.c
index b8b8428e..b751ea9a 100644
--- 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
index 1824167f..da17e769 100644
--- 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
index c4887ca7..f6c079e7 100644
--- 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
index 1087c152..25c3b045 100644
--- 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
index 77cf2b69..e823874d 100644
--- 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,

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.