[tor-commits] [tor/master] Support 'none' in torrc for HiddenServiceExportCircuitID.

[nickm at torproject.org]

commit 8ecaf41003cc5b513cf26c4ae176d5043f5a6a93
Author: Alexander Færøy <ahf at torproject.org>
Date:   Thu Sep 20 20:59:42 2018 +0200

    Support 'none' in torrc for HiddenServiceExportCircuitID.
    
    See: https://bugs.torproject.org/4700
---
 doc/tor.1.txt              | 3 ++-
 src/feature/hs/hs_config.c | 5 ++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index d260eec10..df298e1d7 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -2838,7 +2838,8 @@ The following options are used to configure a hidden service.
 [[HiddenServiceExportCircuitID]] **HiddenServiceExportCircuitID** __protocol__::
    The onion service will use the given protocol to expose the global circuit
    identifier of each inbound client circuit via the selected protocol. The only
-   protocol supported right now \'haproxy\'. This option is only for v3 services.
+   protocol supported right now \'haproxy\'. This option is only for v3
+   services. (Default: none)
 
 [[HiddenServiceMaxStreams]] **HiddenServiceMaxStreams** __N__::
    The maximum number of simultaneous streams (connections) per rendezvous
diff --git a/src/feature/hs/hs_config.c b/src/feature/hs/hs_config.c
index 2378a4d3b..93d7403df 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;
   }