diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/Makefile.am | 2 | ||||
| -rw-r--r-- | src/backend/taler-merchant-httpd.c | 2 | ||||
| -rw-r--r-- | src/backend/taler-merchant-httpd_pay.c | 8 | ||||
| -rw-r--r-- | src/backenddb/Makefile.am | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/src/backend/Makefile.am b/src/backend/Makefile.am index 44e5b551..a1aaf540 100644 --- a/src/backend/Makefile.am +++ b/src/backend/Makefile.am @@ -27,7 +27,7 @@ taler_merchant_httpd_SOURCES = \ taler_merchant_httpd_LDADD = \ - $(top_srcdir)/src/backenddb/libtalermerchantdb.la \ + $(top_builddir)/src/backenddb/libtalermerchantdb.la \ -ltalerexchange \ -ltalerjson \ -ltalerutil \ diff --git a/src/backend/taler-merchant-httpd.c b/src/backend/taler-merchant-httpd.c index b02436d1..472a4fb7 100644 --- a/src/backend/taler-merchant-httpd.c +++ b/src/backend/taler-merchant-httpd.c @@ -543,7 +543,7 @@ instances_iterator_cb (void *cls, } #ifdef EXTRADEBUG else { - GNUNET_log (GNUNET_ERROR_TYPE_INFO, + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Added element at %p, by by-id key %s of '%s' in hashmap\n", mi, GNUNET_h2s (&h_id), diff --git a/src/backend/taler-merchant-httpd_pay.c b/src/backend/taler-merchant-httpd_pay.c index 3feceb50..a920db06 100644 --- a/src/backend/taler-merchant-httpd_pay.c +++ b/src/backend/taler-merchant-httpd_pay.c @@ -662,7 +662,7 @@ process_pay_with_exchange (void *cls, { GNUNET_break_op (0); resume_pay_with_response (pc, - MHD_HTTP_NOT_ACCEPTABLE, + MHD_HTTP_METHOD_NOT_ACCEPTABLE, TMH_RESPONSE_make_external_error (TALER_EC_PAY_PAYMENT_INSUFFICIENT_DUE_TO_FEES, "insufficient funds (including excessive exchange fees to be covered by customer)")); return; @@ -676,7 +676,7 @@ process_pay_with_exchange (void *cls, { GNUNET_break_op (0); resume_pay_with_response (pc, - MHD_HTTP_NOT_ACCEPTABLE, + MHD_HTTP_METHOD_NOT_ACCEPTABLE, TMH_RESPONSE_make_external_error (TALER_EC_PAY_PAYMENT_INSUFFICIENT, "insufficient funds")); return; @@ -725,7 +725,7 @@ process_pay_with_exchange (void *cls, TMH_RESPONSE_make_json_pack ("{s:s, s:I, s:i}", "hint", "Coin signature invalid.", "code", (json_int_t) TALER_EC_PAY_COIN_SIGNATURE_INVALID, - + "coin_idx", i)); return; } @@ -1167,7 +1167,7 @@ MH_handler_pay (struct TMH_RequestHandler *rh, if (GNUNET_NO == pc->transaction_exits) { /* #4521 goes here: Check if the customer respects pay_deadline */ - now = GNUNET_TIME_absolute_get (); + now = GNUNET_TIME_absolute_get (); if (now.abs_value_us > pc->pay_deadline.abs_value_us) { /* Time expired, we don't accept this payment now! */ diff --git a/src/backenddb/Makefile.am b/src/backenddb/Makefile.am index a96bcdfb..1b0be360 100644 --- a/src/backenddb/Makefile.am +++ b/src/backenddb/Makefile.am @@ -56,7 +56,7 @@ test_merchantdb_postgres_LDFLAGS = \ -ljansson test_merchantdb_postgres_LDADD = \ - $(top_srcdir)/src/backenddb/libtalermerchantdb.la + $(top_builddir)/src/backenddb/libtalermerchantdb.la TESTS = \ test-merchantdb-postgres |