summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2019-09-17 19:26:45 -0400
committerNick Mathewson <nickm@torproject.org>2019-09-17 19:26:45 -0400
commit25af8ada30b84a0df19763bbc226ae209c38a1a0 (patch)
tree1ead4203b8b6d910be5c8d447102b4e6c9a39631
parenta3342b382a1a87bbe41aa057761cd83daeadbfc7 (diff)
downloadtor-25af8ada30b84a0df19763bbc226ae209c38a1a0.tar.gz
tor-25af8ada30b84a0df19763bbc226ae209c38a1a0.zip
Correct the syntax description for the MAPADDRESS command.
In 0.4.1.1-alpha I introduced a bug where we would require and ignore a single positional argument. Fixes bug 31772.
-rw-r--r--changes/ticket317724
-rw-r--r--src/feature/control/control_cmd.c4
2 files changed, 7 insertions, 1 deletions
diff --git a/changes/ticket31772 b/changes/ticket31772
new file mode 100644
index 0000000000..7847b3f746
--- /dev/null
+++ 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
index abb579bd43..e0706ee4c8 100644
--- 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,
};