diff options
| -rw-r--r-- | src/auditor/report-lib.c | 24 | ||||
| -rw-r--r-- | src/exchange-tools/taler-exchange-offline.c | 10 | ||||
| -rw-r--r-- | src/exchangedb/exchangedb_accounts.c | 11 | ||||
| -rw-r--r-- | src/include/taler_exchangedb_lib.h | 11 |
4 files changed, 13 insertions, 43 deletions
diff --git a/src/auditor/report-lib.c b/src/auditor/report-lib.c index 1243d3408..481ee357d 100644 --- a/src/auditor/report-lib.c +++ b/src/auditor/report-lib.c @@ -752,10 +752,10 @@ TALER_ARL_init (const struct GNUNET_CONFIGURATION_Handle *c) strlen (master_public_key_str), &TALER_ARL_master_pub.eddsa_pub)) { - GNUNET_log_config_malformed (GNUNET_ERROR_TYPE_ERROR, - "exchange", - "MASTER_PUBLIC_KEY", - "invalid key"); + GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR, + "exchange", + "MASTER_PUBLIC_KEY", + "invalid key"); GNUNET_free (master_public_key_str); return GNUNET_SYSERR; } @@ -772,7 +772,7 @@ TALER_ARL_init (const struct GNUNET_CONFIGURATION_Handle *c) char *fn; if (GNUNET_OK == - GNUNET_CONFIGURATION_get_value_filename (kcfg, + GNUNET_CONFIGURATION_get_value_filename (c, "auditor", "AUDITOR_PRIV_FILE", &fn)) @@ -785,7 +785,7 @@ TALER_ARL_init (const struct GNUNET_CONFIGURATION_Handle *c) &auditor_priv.eddsa_priv)) { GNUNET_CRYPTO_eddsa_key_get_public (&auditor_priv.eddsa_priv, - &auditor_pub.eddsa_pub); + &TALER_ARL_auditor_pub.eddsa_pub); } GNUNET_free (fn); } @@ -797,7 +797,7 @@ TALER_ARL_init (const struct GNUNET_CONFIGURATION_Handle *c) char *auditor_public_key_str; if (GNUNET_OK != - GNUNET_CONFIGURATION_get_value_string (TALER_ARL_cfg, + GNUNET_CONFIGURATION_get_value_string (c, "auditor", "PUBLIC_KEY", &auditor_public_key_str)) @@ -810,13 +810,13 @@ TALER_ARL_init (const struct GNUNET_CONFIGURATION_Handle *c) if (GNUNET_OK != GNUNET_CRYPTO_eddsa_public_key_from_string ( auditor_public_key_str, - strlen (auditor_master_public_key_str), + strlen (auditor_public_key_str), &TALER_ARL_auditor_pub.eddsa_pub)) { - GNUNET_log_config_malformed (GNUNET_ERROR_TYPE_ERROR, - "auditor", - "PUBLIC_KEY", - "invalid key"); + GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR, + "auditor", + "PUBLIC_KEY", + "invalid key"); GNUNET_free (auditor_public_key_str); return GNUNET_SYSERR; } diff --git a/src/exchange-tools/taler-exchange-offline.c b/src/exchange-tools/taler-exchange-offline.c index df30f8018..5e065b5b1 100644 --- a/src/exchange-tools/taler-exchange-offline.c +++ b/src/exchange-tools/taler-exchange-offline.c @@ -2618,14 +2618,6 @@ do_show (char *const *args) } GNUNET_JSON_parse_free (spec); } - /* do NOT consume input if next argument is '-' */ - if ( (NULL != args[0]) && - (0 == strcmp ("-", - args[0])) ) - { - next (args + 1); - return; - } json_decref (in); in = NULL; next (args); @@ -3053,7 +3045,7 @@ work (void *cls) { .name = "wire-fee", .help = - "sign wire fees for the given year (year, wire fee and closing fee must be given as arguments)", + "sign wire fees for the given year (year, wire method, wire fee and closing fee must be given as arguments)", .cb = &do_set_wire_fee }, { diff --git a/src/exchangedb/exchangedb_accounts.c b/src/exchangedb/exchangedb_accounts.c index 7e3edf1c8..922ab6dab 100644 --- a/src/exchangedb/exchangedb_accounts.c +++ b/src/exchangedb/exchangedb_accounts.c @@ -76,7 +76,6 @@ check_for_account (void *cls, struct FindAccountContext *ctx = cls; char *method; char *payto_uri; - char *wire_response_filename; if (0 != strncasecmp (section, "exchange-account-", @@ -104,18 +103,10 @@ check_for_account (void *cls, GNUNET_free (payto_uri); return; } - if (GNUNET_OK != - GNUNET_CONFIGURATION_get_value_filename (ctx->cfg, - section, - "WIRE_RESPONSE", - &wire_response_filename)) - wire_response_filename = NULL; { struct TALER_EXCHANGEDB_AccountInfo ai = { .section_name = section, .method = method, - .payto_uri = payto_uri, - .wire_response_filename = wire_response_filename, .debit_enabled = (GNUNET_YES == GNUNET_CONFIGURATION_get_value_yesno ( ctx->cfg, @@ -130,9 +121,7 @@ check_for_account (void *cls, ctx->cb (ctx->cb_cls, &ai); } - GNUNET_free (payto_uri); GNUNET_free (method); - GNUNET_free (wire_response_filename); } diff --git a/src/include/taler_exchangedb_lib.h b/src/include/taler_exchangedb_lib.h index b68c0d66c..c850c691e 100644 --- a/src/include/taler_exchangedb_lib.h +++ b/src/include/taler_exchangedb_lib.h @@ -64,17 +64,6 @@ struct TALER_EXCHANGEDB_AccountInfo const char *method; /** - * payto://-URL of the account. - */ - const char *payto_uri; - - /** - * Filename containing the signed /wire response, or NULL - * if not given. - */ - const char *wire_response_filename; - - /** * #GNUNET_YES if this account is enabed to be debited * by the taler-exchange-aggregator. */ |