Browse Source

Merge branch 'maint-0.4.1'

Nick Mathewson 4 years ago
parent
commit
d6d3e829dd
2 changed files with 7 additions and 1 deletions
  1. 4 0
      changes/ticket31772
  2. 3 1
      src/feature/control/control_cmd.c

+ 4 - 0
changes/ticket31772

@@ -0,0 +1,4 @@
+  o Minor bugfixes (controller protocol):
+    - Fix the MAPADDRESS controller command to accept one or more
+      arguments. Previously, it required two or more arguments, and ignored
+      the first. Fixes bug 31772; bugfix on 0.4.1.1-alpha.

+ 3 - 1
src/feature/control/control_cmd.c

@@ -639,7 +639,9 @@ address_is_invalid_mapaddress_target(const char *addr)
 }
 
 static const control_cmd_syntax_t mapaddress_syntax = {
-  .max_args=1,
+  // no positional arguments are expected
+  .max_args=0,
+  // an arbitrary number of K=V entries are supported.
   .accept_keywords=true,
 };