From c0451f0982bdb565f431417cea3ab0238342d125 Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Thu, 26 May 2016 16:38:59 +0200
Subject: fix #4533 for exchange (breaks interaction with bank for
 /admin/add/incoming)

---
 src/exchange/taler-exchange-httpd_db.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'src/exchange/taler-exchange-httpd_db.c')

diff --git a/src/exchange/taler-exchange-httpd_db.c b/src/exchange/taler-exchange-httpd_db.c
index 7e3ce0a44..43de27e9c 100644
--- a/src/exchange/taler-exchange-httpd_db.c
+++ b/src/exchange/taler-exchange-httpd_db.c
@@ -1253,7 +1253,7 @@ check_commitment (struct MHD_Connection *connection,
     struct GNUNET_HashCode h_msg;
     char *buf;
     size_t buf_len;
-    
+
     TALER_refresh_decrypt (&commit_coins[j].refresh_link,
 			   &shared_secret,
 			   &link_data);
@@ -1275,7 +1275,7 @@ check_commitment (struct MHD_Connection *connection,
                                                             "Blinding error"))
           ? GNUNET_NO : GNUNET_SYSERR;
     }
-      
+
     if ( (buf_len != commit_coins[j].coin_ev_size) ||
          (0 != memcmp (buf,
                        commit_coins[j].coin_ev,
@@ -1690,7 +1690,8 @@ TMH_DB_execute_refresh_link (struct MHD_Connection *connection,
  * @param reserve_pub public key of the reserve
  * @param amount amount to add to the reserve
  * @param execution_time when did we receive the wire transfer
- * @param wire details about the wire transfer
+ * @param sender_account_details which account send the funds
+ * @param transfer_details information that uniquely identifies the transfer
  * @return MHD result code
  */
 int
@@ -1698,7 +1699,8 @@ TMH_DB_execute_admin_add_incoming (struct MHD_Connection *connection,
                                    const struct TALER_ReservePublicKeyP *reserve_pub,
                                    const struct TALER_Amount *amount,
                                    struct GNUNET_TIME_Absolute execution_time,
-                                   json_t *wire)
+                                   const json_t *sender_account_details,
+                                   const json_t *transfer_details)
 {
   struct TALER_EXCHANGEDB_Session *session;
   int ret;
@@ -1713,7 +1715,8 @@ TMH_DB_execute_admin_add_incoming (struct MHD_Connection *connection,
                                         reserve_pub,
                                         amount,
                                         execution_time,
-                                        wire);
+                                        sender_account_details,
+                                        transfer_details);
   if (GNUNET_SYSERR == ret)
   {
     GNUNET_break (0);
-- 
cgit v1.2.3