[taler-exchange] branch master updated: ensure statements are prepared before keys subsystem initialization

[gnunet]

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

grothoff pushed a commit to branch master
in repository exchange.

The following commit(s) were added to refs/heads/master by this push:
     new 18a68ab7 ensure statements are prepared before keys subsystem 
initialization
18a68ab7 is described below

commit 18a68ab78965be39d6a457675f17d33b3b81c1cb
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Wed Aug 25 11:45:13 2021 +0200

    ensure statements are prepared before keys subsystem initialization
---
 contrib/gana                             | 2 +-
 src/exchange/taler-exchange-httpd.c      | 7 +++++++
 src/exchange/taler-exchange-httpd_keys.c | 3 ++-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/contrib/gana b/contrib/gana
index 79a1ebfd..be874165 160000
--- a/contrib/gana
+++ b/contrib/gana
@@ -1 +1 @@
-Subproject commit 79a1ebfdffab6b01137a4642161e907f89c5c535
+Subproject commit be874165f95694e52ded88090ac18d682b943f67
diff --git a/src/exchange/taler-exchange-httpd.c 
b/src/exchange/taler-exchange-httpd.c
index 50aa85f7..af0a4908 100644
--- a/src/exchange/taler-exchange-httpd.c
+++ b/src/exchange/taler-exchange-httpd.c
@@ -1419,6 +1419,13 @@ run (void *cls,
     GNUNET_SCHEDULER_shutdown ();
     return;
   }
+  if (GNUNET_SYSERR ==
+      TEH_plugin->preflight (TEH_plugin->cls))
+  {
+    global_ret = EXIT_FAILURE;
+    GNUNET_SCHEDULER_shutdown ();
+    return;
+  }
   if (GNUNET_OK !=
       TEH_keys_init ())
   {
diff --git a/src/exchange/taler-exchange-httpd_keys.c 
b/src/exchange/taler-exchange-httpd_keys.c
index 5d25600c..77b2e9cf 100644
--- a/src/exchange/taler-exchange-httpd_keys.c
+++ b/src/exchange/taler-exchange-httpd_keys.c
@@ -1711,7 +1711,8 @@ build_key_state (struct HelperState *hs,
                                           ksh);
   if (qs < 0)
   {
-    GNUNET_break (0);
+    GNUNET_break (GNUNET_DB_STATUS_SOFT_ERROR != qs);
+    GNUNET_break (GNUNET_DB_STATUS_HARD_ERROR != qs);
     destroy_key_state (ksh,
                        true);
     return NULL;

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