fix report when same exchange URL is configured in multiple configuration sections

1 files changed, 11 insertions, 1 deletions

diff --git a/src/backend/taler-merchant-httpd_exchanges.c b/src/backend/taler-merchant-httpd_exchanges.c
index 78b4eea6..22eb0f40 100644
--- a/src/backend/taler-merchant-httpd_exchanges.c
+++ b/src/backend/taler-merchant-httpd_exchanges.c
@@ -1276,6 +1276,8 @@ accept_exchanges (void *cls,
   struct TMH_Exchange *exchange;
   char *currency;
 
+  if (GNUNET_SYSERR == trusted_exchange_count)
+    return;
   if (0 != strncasecmp (section,
                         "merchant-exchange-",
                         strlen ("merchant-exchange-")))
@@ -1348,7 +1350,15 @@ accept_exchanges (void *cls,
               "Setup exchange %s as %s\n",
               exchange->url,
               exchange->trusted ? "trusted" : "untrusted");
-  GNUNET_assert (NULL == exchange->retry_task);
+  if (NULL != exchange->retry_task)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Exchange at `%s' configured in multiple configuration sections (see `%s')!\n",
+                exchange->url,
+                section);
+    trusted_exchange_count = GNUNET_SYSERR;
+    return;
+  }
   exchange->retry_task
     = GNUNET_SCHEDULER_add_now (&retry_exchange,
                                 exchange);