nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 04:13:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'dgoulet/bug21033_030_01'

Browse Source
This commit is contained in:
Nick Mathewson 2017-01-18 09:08:16 -05:00
commit 4334a4b784
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changes/bug21033 Normal file
View File

@ -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.

6
src/or/rendservice.c
View File

@ -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",