sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
This commit is contained in:
Nick Mathewson 2007-10-18 11:56:56 +00:00
parent d3a6276031
commit b3c6fd7fc6
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -49,6 +49,8 @@ Changes in version 0.1.2.18 - 2007-10-??
- It's not actually an error to find a non-pending entry in the DNS
cache when canceling a pending resolve. Don't log unless stuff
is fishy. Resolves bug 463.
- Don't reset trusted dir server list when we set a configuration option.
(Patch from Robert Hogan.)
Changes in version 0.1.2.17 - 2007-08-30

3
doc/TODO.012
View File

@ -14,4 +14,5 @@ Backport for 0.1.2.x once better tested:
o r11499, r11500, r11501: hidserv hexdigests rather than nicknames
o r11829: Don't warn when cancel_pending_resolve() finds a cached failure.
o r11915: just because you hup, don't publish a near-duplicate descriptor
- r11994: Call routerlist_remove_old_routers() less. This will be a
tricky backport.

7
src/or/config.c
View File

@ -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) {