tor

commit 0a86f14addd031ac69647f4ab6fc66c1835cd31e
parent 130eb227acd8a8717dcc5258c4dd5b2adc79930b
Author: George Kadianakis <desnacked@riseup.net>
Date:   Mon, 27 May 2019 14:22:01 +0300

Merge branch 'tor-github/pr/1042'

Diffstat:
A
changes/ticket30580
 | 
4
++++
M
src/feature/control/control_cmd.c
 | 
8
+++++---

2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/changes/ticket30580 b/changes/ticket30580
@@ -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.
diff --git a/src/feature/control/control_cmd.c b/src/feature/control/control_cmd.c
@@ -1049,9 +1049,11 @@ handle_control_postdescriptor(control_connection_t *conn,
   line = config_line_find_case(args->kwargs, "purpose");
   if (line) {
     purpose = router_purpose_from_string(line->value);
-    control_printf_endreply(conn, 552, "Unknown purpose \"%s\"",
-                            line->value);
-    goto done;
+    if (purpose == ROUTER_PURPOSE_UNKNOWN) {
+      control_printf_endreply(conn, 552, "Unknown purpose \"%s\"",
+                              line->value);
+      goto done;
+    }
   }
   line = config_line_find_case(args->kwargs, "cache");
   if (line) {