diff options
Diffstat (limited to 'src/exchange')
| -rw-r--r-- | src/exchange/Makefile.am | 1 | ||||
| -rw-r--r-- | src/exchange/taler-exchange-httpd.c | 9 | ||||
| -rw-r--r-- | src/exchange/taler-exchange-httpd_purses_merge.c | 11 |
3 files changed, 10 insertions, 11 deletions
diff --git a/src/exchange/Makefile.am b/src/exchange/Makefile.am index 881a3f36..4d7d6d94 100644 --- a/src/exchange/Makefile.am +++ b/src/exchange/Makefile.am @@ -177,6 +177,7 @@ taler_exchange_httpd_LDADD = \ $(top_builddir)/src/mhd/libtalermhd.la \ $(top_builddir)/src/json/libtalerjson.la \ $(top_builddir)/src/exchangedb/libtalerexchangedb.la \ + $(top_builddir)/src/templating/libtalertemplating.la \ $(top_builddir)/src/kyclogic/libtalerkyclogic.la \ $(top_builddir)/src/util/libtalerutil.la \ $(top_builddir)/src/extensions/libtalerextensions.la \ diff --git a/src/exchange/taler-exchange-httpd.c b/src/exchange/taler-exchange-httpd.c index e7d07043..c91dbfbb 100644 --- a/src/exchange/taler-exchange-httpd.c +++ b/src/exchange/taler-exchange-httpd.c @@ -28,6 +28,7 @@ #include <sys/resource.h> #include <limits.h> #include "taler_kyclogic_lib.h" +#include "taler_templating_lib.h" #include "taler_mhd_lib.h" #include "taler-exchange-httpd_auditors.h" #include "taler-exchange-httpd_batch-deposit.h" @@ -2125,6 +2126,7 @@ do_shutdown (void *cls) GNUNET_CURL_gnunet_rc_destroy (exchange_curl_rc); exchange_curl_rc = NULL; } + TALER_TEMPLATING_done (); } @@ -2162,6 +2164,13 @@ run (void *cls, GNUNET_SCHEDULER_shutdown (); return; } + if (GNUNET_OK != + TALER_TEMPLATING_init ("exchange")) + { + global_ret = EXIT_FAILURE; + GNUNET_SCHEDULER_shutdown (); + return; + } if (GNUNET_SYSERR == TEH_plugin->preflight (TEH_plugin->cls)) { diff --git a/src/exchange/taler-exchange-httpd_purses_merge.c b/src/exchange/taler-exchange-httpd_purses_merge.c index 8751e3f1..9ce3033d 100644 --- a/src/exchange/taler-exchange-httpd_purses_merge.c +++ b/src/exchange/taler-exchange-httpd_purses_merge.c @@ -275,7 +275,6 @@ merge_transaction (void *cls, bool in_conflict = true; bool no_balance = true; bool no_partner = true; - bool no_reserve = true; const char *required; required = TALER_KYCLOGIC_kyc_test_required ( @@ -305,7 +304,6 @@ merge_transaction (void *cls, &pcc->reserve_pub, &no_partner, &no_balance, - &no_reserve, &in_conflict); if (qs < 0) { @@ -329,15 +327,6 @@ merge_transaction (void *cls, pcc->provider_url); return GNUNET_DB_STATUS_HARD_ERROR; } - if (no_reserve) - { - *mhd_ret = - TALER_MHD_reply_with_error (connection, - MHD_HTTP_NOT_FOUND, - TALER_EC_EXCHANGE_GENERIC_RESERVE_UNKNOWN, - NULL); - return GNUNET_DB_STATUS_HARD_ERROR; - } if (no_balance) { *mhd_ret = |