diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-01-18 09:08:16 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-01-18 09:08:16 -0500 |
| commit | 4334a4b784e6c2fb0f969f1a037f85bcd1c3b4fc (patch) | |
| tree | 297d345ac32fb090fa7992d1f86380fe3a542af3 | |
| parent | e69afb853dde958c6efd94dfdb0cd18f01f7d841 (diff) | |
| parent | 1636777dc8386a4db67df3a3f1855afd8dacba34 (diff) | |
| download | tor-4334a4b784e6c2fb0f969f1a037f85bcd1c3b4fc.tar.gz tor-4334a4b784e6c2fb0f969f1a037f85bcd1c3b4fc.zip | |
Merge remote-tracking branch 'dgoulet/bug21033_030_01'
| -rw-r--r-- | changes/bug21033 | 5 | ||||
| -rw-r--r-- | 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 0000000000..c4b3deab43 --- /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 e423cb71ef..00f251588c 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", |