diff options
| author | Nick Mathewson <nickm@torproject.org> | 2007-10-18 11:56:56 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2007-10-18 11:56:56 +0000 |
| commit | b3c6fd7fc6653e9d9507fd2663b743228e3045fd (patch) | |
| tree | f947a30d74f72733489d5632cde12bc53ed4ff3e /src | |
| parent | d3a6276031adb0cedb123b694dfc8277f17882ae (diff) | |
| download | tor-b3c6fd7fc6653e9d9507fd2663b743228e3045fd.tar.gz tor-b3c6fd7fc6653e9d9507fd2663b743228e3045fd.zip | |
r15881@catbus: nickm | 2007-10-17 14:59:36 -0400
Backport: Patch from robert hogan: do not reset trusted dir server list when we get a config option.
svn:r12014
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/config.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/or/config.c b/src/or/config.c index 39dc7aee90..2be061bcf4 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -441,7 +441,7 @@ static config_var_description_t options_description[] = { "and servers." }, { "ORListenAddress", "Bind to this address to listen for connections from " "clients and servers, instead of the default 0.0.0.0:ORPort." }, - { "PublishServerDescriptors", "Set to 0 in order to keep the server from " + { "PublishServerDescriptor", "Set to 0 in order to keep the server from " "uploading info to the directory authorities." }, /*{ "RedirectExit", "When an outgoing connection tries to connect to a " *"given address, redirect it to another address instead." }, @@ -885,8 +885,8 @@ options_act(or_options_t *old_options) int running_tor = options->command == CMD_RUN_TOR; char *msg; - clear_trusted_dir_servers(); if (options->DirServers) { + clear_trusted_dir_servers(); for (cl = options->DirServers; cl; cl = cl->next) { if (parse_dir_server_line(cl->value, 0)<0) { log_err(LD_BUG, @@ -895,7 +895,8 @@ options_act(or_options_t *old_options) } } } else { - add_default_trusted_dirservers(); + if (!router_get_trusted_dir_servers()) + add_default_trusted_dirservers(); } if (running_tor && rend_config_services(options, 0)<0) { |