From 8ecaf41003cc5b513cf26c4ae176d5043f5a6a93 Mon Sep 17 00:00:00 2001 From: Alexander Færøy Date: Thu, 20 Sep 2018 20:59:42 +0200 Subject: Support 'none' in torrc for HiddenServiceExportCircuitID. See: https://bugs.torproject.org/4700 --- src/feature/hs/hs_config.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/feature/hs/hs_config.c') diff --git a/src/feature/hs/hs_config.c b/src/feature/hs/hs_config.c index 2378a4d3b2..93d7403dfb 100644 --- a/src/feature/hs/hs_config.c +++ b/src/feature/hs/hs_config.c @@ -161,8 +161,11 @@ helper_parse_circuit_id_protocol(const char *key, const char *value, int *ok) if (! strcasecmp(value, "haproxy")) { *ok = 1; ret = HS_CIRCUIT_ID_PROTOCOL_HAPROXY; + } else if (! strcasecmp(value, "none")) { + *ok = 1; + ret = HS_CIRCUIT_ID_PROTOCOL_NONE; } else { - log_warn(LD_CONFIG, "%s must be 'haproxy'.", key); + log_warn(LD_CONFIG, "%s must be 'haproxy' or 'none'.", key); goto err; } -- cgit v1.2.3-54-g00ecf