diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/taler-merchant-httpd.c | 1 | ||||
| -rw-r--r-- | src/backend/taler-merchant-httpd_exchanges.c | 2 | ||||
| -rw-r--r-- | src/backenddb/plugin_merchantdb_postgres.c | 24 | ||||
| -rw-r--r-- | src/include/taler_merchant_service.h | 1 | ||||
| -rw-r--r-- | src/testing/testing_api_cmd_instance_auth.c | 14 |
5 files changed, 23 insertions, 19 deletions
diff --git a/src/backend/taler-merchant-httpd.c b/src/backend/taler-merchant-httpd.c index 1ee4c1b3..b331bef5 100644 --- a/src/backend/taler-merchant-httpd.c +++ b/src/backend/taler-merchant-httpd.c @@ -1978,6 +1978,7 @@ url_handler (void *cls, * @param merchant_pub public key of the instance * @param merchant_priv private key of the instance, NULL if not available * @param is detailed configuration settings for the instance + * @param ias authentication settings for the instance * @param accounts_length length of the @a accounts array * @param accounts list of accounts of the merchant */ diff --git a/src/backend/taler-merchant-httpd_exchanges.c b/src/backend/taler-merchant-httpd_exchanges.c index b4bc1b63..b1657e17 100644 --- a/src/backend/taler-merchant-httpd_exchanges.c +++ b/src/backend/taler-merchant-httpd_exchanges.c @@ -744,7 +744,7 @@ wire_task_cb (void *cls) /** * Free @a exchange. * - * @param[in] entry to free + * @param[in] exchange entry to free */ static void free_exchange_entry (struct Exchange *exchange) diff --git a/src/backenddb/plugin_merchantdb_postgres.c b/src/backenddb/plugin_merchantdb_postgres.c index cb9d1163..efdfff9a 100644 --- a/src/backenddb/plugin_merchantdb_postgres.c +++ b/src/backenddb/plugin_merchantdb_postgres.c @@ -610,15 +610,16 @@ postgres_lookup_instances (void *cls, * @param merchant_pub public key of the instance * @param merchant_priv private key of the instance * @param is details about the instance + * @param ias authentication settings for the instance * @return database result code */ static enum GNUNET_DB_QueryStatus -postgres_insert_instance (void *cls, - const struct TALER_MerchantPublicKeyP *merchant_pub, - const struct TALER_MerchantPrivateKeyP *merchant_priv, - const struct TALER_MERCHANTDB_InstanceSettings *is, - const struct - TALER_MERCHANTDB_InstanceAuthSettings *ias) +postgres_insert_instance ( + void *cls, + const struct TALER_MerchantPublicKeyP *merchant_pub, + const struct TALER_MerchantPrivateKeyP *merchant_priv, + const struct TALER_MERCHANTDB_InstanceSettings *is, + const struct TALER_MERCHANTDB_InstanceAuthSettings *ias) { struct PostgresClosure *pg = cls; struct GNUNET_PQ_QueryParam params[] = { @@ -776,14 +777,15 @@ postgres_update_instance (void *cls, * into our database. * * @param cls closure - * @param ias details about the instance + * @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) +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[] = { diff --git a/src/include/taler_merchant_service.h b/src/include/taler_merchant_service.h index 953b1301..471da35a 100644 --- a/src/include/taler_merchant_service.h +++ b/src/include/taler_merchant_service.h @@ -503,6 +503,7 @@ typedef void * @param default_max_deposit_fee default maximum deposit fee merchant is willing to pay * @param default_wire_transfer_delay default wire transfer delay merchant will ask for * @param default_pay_delay default validity period for offers merchant makes + * @param auth_token authentication token to use for access control, NULL for external auth * @param cb function to call with the * backend's instances information * @param cb_cls closure for @a config_cb diff --git a/src/testing/testing_api_cmd_instance_auth.c b/src/testing/testing_api_cmd_instance_auth.c index 3f58c0a8..f44b025f 100644 --- a/src/testing/testing_api_cmd_instance_auth.c +++ b/src/testing/testing_api_cmd_instance_auth.c @@ -17,7 +17,7 @@ <http://www.gnu.org/licenses/> */ /** - * @file testing_api_cmd_instance-auth.c + * @file testing_api_cmd_instance_auth.c * @brief command to test /private/auth POSTing * @author Christian Grothoff */ @@ -119,8 +119,8 @@ auth_instance_cb (void *cls, */ static void auth_instance_run (void *cls, - const struct TALER_TESTING_Command *cmd, - struct TALER_TESTING_Interpreter *is) + const struct TALER_TESTING_Command *cmd, + struct TALER_TESTING_Interpreter *is) { struct AuthInstanceState *ais = cls; @@ -144,7 +144,7 @@ auth_instance_run (void *cls, */ static void auth_instance_cleanup (void *cls, - const struct TALER_TESTING_Command *cmd) + const struct TALER_TESTING_Command *cmd) { struct AuthInstanceState *ais = cls; @@ -169,9 +169,9 @@ auth_instance_cleanup (void *cls, */ static int auth_instance_traits (void *cls, - const void **ret, - const char *trait, - unsigned int index) + const void **ret, + const char *trait, + unsigned int index) { struct AuthInstanceState *ais = cls; |