diff options
author | Christian Grothoff <christian@grothoff.org> | 2021-08-25 11:45:13 +0200 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2021-08-25 11:45:13 +0200 |
commit | 18a68ab78965be39d6a457675f17d33b3b81c1cb (patch) | |
tree | 61ea252efe451ae701938f6ef5d09770786748b4 | |
parent | e50a5f4d2b85a47b1318bda2f4890812b0a8afad (diff) |
ensure statements are prepared before keys subsystem initialization
m--------- | contrib/gana | 0 | ||||
-rw-r--r-- | src/exchange/taler-exchange-httpd.c | 7 | ||||
-rw-r--r-- | src/exchange/taler-exchange-httpd_keys.c | 3 |
3 files changed, 9 insertions, 1 deletions
diff --git a/contrib/gana b/contrib/gana -Subproject 79a1ebfdffab6b01137a4642161e907f89c5c53 +Subproject be874165f95694e52ded88090ac18d682b943f6 diff --git a/src/exchange/taler-exchange-httpd.c b/src/exchange/taler-exchange-httpd.c index 50aa85f7b..af0a49082 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 5d25600c4..77b2e9cfc 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; |