aboutsummaryrefslogtreecommitdiff
path: root/src/feature/hs/hs_client.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2019-02-08 08:37:43 -0500
committerNick Mathewson <nickm@torproject.org>2019-02-08 08:37:43 -0500
commitab6534781996404ca57e9f5b0cbdda998579c329 (patch)
treebab5257169246e99f755f1c93585139687fa5549 /src/feature/hs/hs_client.c
parent4b36f9676db4ca98101c26ba5fc539ed458ae571 (diff)
parenteca0f87801ea5062038544b6cfe2bdbba0998999 (diff)
downloadtor-ab6534781996404ca57e9f5b0cbdda998579c329.tar.gz
tor-ab6534781996404ca57e9f5b0cbdda998579c329.zip
Merge branch 'ticket29040_1_changes' into maint-0.3.5
Diffstat (limited to 'src/feature/hs/hs_client.c')
-rw-r--r--src/feature/hs/hs_client.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/feature/hs/hs_client.c b/src/feature/hs/hs_client.c
index d4eee50bb7..bd43ef6132 100644
--- a/src/feature/hs/hs_client.c
+++ b/src/feature/hs/hs_client.c
@@ -1637,17 +1637,17 @@ hs_config_client_authorization(const or_options_t *options,
* as a key of global map in the future. */
if (hs_parse_address(auth->onion_address, &identity_pk,
NULL, NULL) < 0) {
- client_service_authorization_free(auth);
log_warn(LD_REND, "The onion address \"%s\" is invalid in "
"file %s", filename, auth->onion_address);
+ client_service_authorization_free(auth);
continue;
}
if (digest256map_get(auths, identity_pk.pubkey)) {
- client_service_authorization_free(auth);
log_warn(LD_REND, "Duplicate authorization for the same hidden "
"service address %s.",
- safe_str_client(auth->onion_address));
+ safe_str_client_opts(options, auth->onion_address));
+ client_service_authorization_free(auth);
goto end;
}