[tor-commits] [tor/master] hs: Allow from 0 to MAX introduction points

[nickm at torproject.org]

commit 1636777dc8386a4db67df3a3f1855afd8dacba34
Author: David Goulet <dgoulet at torproject.org>
Date:   Tue Jan 17 14:53:06 2017 -0500

    hs: Allow from 0 to MAX introduction points
    
    An operator couldn't set the number of introduction point below the default
    value which is 3. With this commit, from 0 to the hardcoded maximum is now
    allowed.
    
    Closes #21033
    
    Signed-off-by: David Goulet <dgoulet at torproject.org>
---
 changes/bug21033     | 5 +++++
 src/or/rendservice.c | 6 ++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/changes/bug21033 b/changes/bug21033
new file mode 100644
index 0000000..c4b3dea
--- /dev/null
+++ b/changes/bug21033
@@ -0,0 +1,5 @@
+  o Minor bugfixes (hidden service):
+    - Restrict the number of introduction point from 0 to the maximum allowed
+      instead of the default value to the maximum. That was stopping operators
+      from using less than 3 introduction points. Closes #21033; bugfix on
+      tor-0.2.7.2-alpha.
diff --git a/src/or/rendservice.c b/src/or/rendservice.c
index e423cb7..00f2515 100644
--- a/src/or/rendservice.c
+++ b/src/or/rendservice.c
@@ -741,14 +741,12 @@ rend_config_services(const or_options_t *options, int validate_only)
     } else if (!strcasecmp(line->key, "HiddenServiceNumIntroductionPoints")) {
       service->n_intro_points_wanted =
         (unsigned int) tor_parse_long(line->value, 10,
-                                      NUM_INTRO_POINTS_DEFAULT,
-                                      NUM_INTRO_POINTS_MAX, &ok, NULL);
+                                      0, NUM_INTRO_POINTS_MAX, &ok, NULL);
       if (!ok) {
         log_warn(LD_CONFIG,
                  "HiddenServiceNumIntroductionPoints "
                  "should be between %d and %d, not %s",
-                 NUM_INTRO_POINTS_DEFAULT, NUM_INTRO_POINTS_MAX,
-                 line->value);
+                 0, NUM_INTRO_POINTS_MAX, line->value);
         goto free_and_return;
       }
       log_info(LD_CONFIG, "HiddenServiceNumIntroductionPoints=%d for %s",