Merge branch 'tor-github/pr/1042'

This commit is contained in:
George Kadianakis 2019-05-27 14:22:01 +03:00
commit 0a86f14add
2 changed files with 9 additions and 3 deletions

4
changes/ticket30580 Normal file
View File

@ -0,0 +1,4 @@
o Minor bugfixes (controller):
- POSTDESCRIPTOR requests should work again. Previously, they were
broken if a "purpose=" flag was specified. Fixes bug 30580;
bugfix on 0.4.1.1-alpha.

View File

@ -1049,9 +1049,11 @@ handle_control_postdescriptor(control_connection_t *conn,
line = config_line_find_case(args->kwargs, "purpose"); line = config_line_find_case(args->kwargs, "purpose");
if (line) { if (line) {
purpose = router_purpose_from_string(line->value); purpose = router_purpose_from_string(line->value);
control_printf_endreply(conn, 552, "Unknown purpose \"%s\"", if (purpose == ROUTER_PURPOSE_UNKNOWN) {
line->value); control_printf_endreply(conn, 552, "Unknown purpose \"%s\"",
goto done; line->value);
goto done;
}
} }
line = config_line_find_case(args->kwargs, "cache"); line = config_line_find_case(args->kwargs, "cache");
if (line) { if (line) {