tor

commit d6d3e829dd20b78e2b80e52f0e3865a1002e653b
parent 7225cfc58671aaaeb2e17e7e46bc1f33b87ab22a
Author: Nick Mathewson <nickm@torproject.org>
Date:   Wed, 18 Sep 2019 08:07:56 -0400

Merge branch 'maint-0.4.1'

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

2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/changes/ticket31772 b/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.
diff --git a/src/feature/control/control_cmd.c b/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,
 };