From d354d119db7ca0195cb93140bf3160b11449fa92 Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Tue, 25 Aug 2020 20:32:36 +0200
Subject: fix #6432

---
 .../taler-merchant-httpd_private-patch-instances-ID.c     | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

(limited to 'src/backend/taler-merchant-httpd_private-patch-instances-ID.c')

diff --git a/src/backend/taler-merchant-httpd_private-patch-instances-ID.c b/src/backend/taler-merchant-httpd_private-patch-instances-ID.c
index 86348156..94c02ea4 100644
--- a/src/backend/taler-merchant-httpd_private-patch-instances-ID.c
+++ b/src/backend/taler-merchant-httpd_private-patch-instances-ID.c
@@ -105,7 +105,7 @@ TMH_private_patch_instances_ID (const struct TMH_RequestHandler *rh,
     return TALER_MHD_reply_with_error (connection,
                                        MHD_HTTP_BAD_REQUEST,
                                        TALER_EC_PATCH_INSTANCES_BAD_PAYTO_URIS,
-                                       "Invalid bank account information");
+                                       NULL);
   for (unsigned int i = 0; i<MAX_RETRIES; i++)
   {
     /* Cleanup after earlier loops */
@@ -130,8 +130,7 @@ TMH_private_patch_instances_ID (const struct TMH_RequestHandler *rh,
       return TALER_MHD_reply_with_error (connection,
                                          MHD_HTTP_BAD_REQUEST,
                                          TALER_EC_POST_INSTANCES_BAD_CURRENCY,
-                                         "Max deposit fee or max wire fee currency incompatible with config");
-      break;
+                                         NULL);
     }
     if (GNUNET_OK !=
         TMH_db->start (TMH_db->cls,
@@ -141,7 +140,7 @@ TMH_private_patch_instances_ID (const struct TMH_RequestHandler *rh,
       return TALER_MHD_reply_with_error (connection,
                                          MHD_HTTP_INTERNAL_SERVER_ERROR,
                                          TALER_EC_PATCH_INSTANCES_DB_START_ERROR,
-                                         "failed to start database transaction");
+                                         NULL);
     }
     /* Check for equality of settings */
     if (! ( (0 == strcmp (mi->settings.name,
@@ -209,7 +208,7 @@ TMH_private_patch_instances_ID (const struct TMH_RequestHandler *rh,
             return TALER_MHD_reply_with_error (connection,
                                                MHD_HTTP_BAD_REQUEST,
                                                TALER_EC_POST_INSTANCES_BAD_PAYTO_URIS,
-                                               "Invalid bank account information");
+                                               NULL);
           }
           if ((0 == strcasecmp (uri,
                                 str)) )
@@ -223,7 +222,7 @@ TMH_private_patch_instances_ID (const struct TMH_RequestHandler *rh,
               return TALER_MHD_reply_with_error (connection,
                                                  MHD_HTTP_BAD_REQUEST,
                                                  TALER_EC_POST_INSTANCES_BAD_PAYTO_URIS,
-                                                 "Invalid bank account information");
+                                                 str);
             }
             matches[i] = true;
             matched = true;
@@ -294,7 +293,7 @@ TMH_private_patch_instances_ID (const struct TMH_RequestHandler *rh,
           return TALER_MHD_reply_with_error (connection,
                                              MHD_HTTP_BAD_REQUEST,
                                              TALER_EC_POST_INSTANCES_BAD_PAYTO_URIS,
-                                             "Invalid bank account information");
+                                             ad.payto_uri);
         }
         wm->active = true;
         GNUNET_CONTAINER_DLL_insert (wm_head,
@@ -338,7 +337,7 @@ giveup:
     return TALER_MHD_reply_with_error (connection,
                                        MHD_HTTP_INTERNAL_SERVER_ERROR,
                                        TALER_EC_PATCH_INSTANCES_DB_COMMIT_ERROR,
-                                       "failed to add instance to database");
+                                       NULL);
   }
   /* Deactivate existing wire methods that were removed above */
   for (struct TMH_WireMethod *wm = mi->wm_head;
-- 
cgit v1.2.3