nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-14 07:03:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.2.8'

Browse Source
This commit is contained in:
Nick Mathewson 2016-05-02 14:02:15 -04:00
commit 8340becd39
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changes/bug18920 Normal file
View File

@ -0,0 +1,5 @@
o Minor bugfixes (controller, microdescriptors):
- Make GETINFO dir/status-vote/current/consensus conform to the control
specification by returning "551 Could not open cached consensus..."
when not caching consensuses.
Fixes bug 18920; bugfix on 0.2.2.6-alpha.

5
src/or/control.c
View File

@ -2011,6 +2011,11 @@ getinfo_helper_dir(control_connection_t *control_conn,
char *filename = get_datadir_fname("cached-consensus"); char *filename = get_datadir_fname("cached-consensus");
*answer = read_file_to_str(filename, RFTS_IGNORE_MISSING, NULL); *answer = read_file_to_str(filename, RFTS_IGNORE_MISSING, NULL);
tor_free(filename); tor_free(filename);
if (!*answer) { /* generate an error */
*errmsg = "Could not open cached consensus. "
"Make sure FetchUselessDescriptors is set to 1.";
return -1;
}
} }
} else if (!strcmp(question, "network-status")) { /* v1 */ } else if (!strcmp(question, "network-status")) { /* v1 */
routerlist_t *routerlist = router_get_routerlist(); routerlist_t *routerlist = router_get_routerlist();