diff options
Diffstat (limited to 'src/backenddb/plugin_merchantdb_postgres.c')
-rw-r--r-- | src/backenddb/plugin_merchantdb_postgres.c | 40 |
1 files changed, 3 insertions, 37 deletions
diff --git a/src/backenddb/plugin_merchantdb_postgres.c b/src/backenddb/plugin_merchantdb_postgres.c index 61e35837..463a8328 100644 --- a/src/backenddb/plugin_merchantdb_postgres.c +++ b/src/backenddb/plugin_merchantdb_postgres.c @@ -50,6 +50,7 @@ #include "pg_delete_instance_private_key.h" #include "pg_purge_instance.h" #include "pg_update_instance.h" +#include "pg_update_instance_auth.h" #include "pg_set_transfer_status_to_confirmed.h" @@ -328,36 +329,6 @@ postgres_commit (void *cls) /** - * Update information about an instance's authentication settings - * into our database. - * - * @param cls closure - * @param merchant_id identity of the instance - * @param is authentication details about the instance - * @return database result code - */ -static enum GNUNET_DB_QueryStatus -postgres_update_instance_auth ( - void *cls, - const char *merchant_id, - const struct TALER_MERCHANTDB_InstanceAuthSettings *is) -{ - struct PostgresClosure *pg = cls; - struct GNUNET_PQ_QueryParam params[] = { - GNUNET_PQ_query_param_string (merchant_id), - GNUNET_PQ_query_param_auto_from_type (&is->auth_hash), - GNUNET_PQ_query_param_auto_from_type (&is->auth_salt), - GNUNET_PQ_query_param_end - }; - - check_connection (pg); - return GNUNET_PQ_eval_prepared_non_select (pg->conn, - "update_instance_auth", - params); -} - - -/** * Set an instance's account in our database to "inactive". * * @param cls closure @@ -6621,12 +6592,6 @@ postgres_connect (void *cls) struct GNUNET_PQ_PreparedStatement ps[] = { GNUNET_PQ_make_prepare ("end_transaction", "COMMIT"), - /* for postgres_update_instance_auth() */ - GNUNET_PQ_make_prepare ("update_instance_auth", - "UPDATE merchant_instances SET" - " auth_hash=$2" - ",auth_salt=$3" - " WHERE merchant_id=$1"), /* for postgres_inactivate_account(); the merchant instance is implied from the random salt that is part of the h_wire calculation */ @@ -8960,7 +8925,8 @@ libtaler_plugin_merchantdb_postgres_init (void *cls) = &TMH_PG_purge_instance; plugin->update_instance = &TMH_PG_update_instance; - plugin->update_instance_auth = &postgres_update_instance_auth; + plugin->update_instance_auth + = &TMH_PG_update_instance_auth; plugin->activate_account = &postgres_activate_account; plugin->inactivate_account = &postgres_inactivate_account; plugin->update_transfer_status |