diff options
| author | Nick Mathewson <nickm@torproject.org> | 2019-09-18 08:07:56 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2019-09-18 08:07:56 -0400 |
| commit | 8136ebba26c08ef54d65ec46dcd4796bb8429b33 (patch) | |
| tree | d21144102a259bfe1c6b227f23f83f058f5e60ae | |
| parent | 84fc0c579b0ffa87b618cf533532d0c13e064c32 (diff) | |
| parent | 70bcff6010f933c7dbce5d797ea354c6475e1f94 (diff) | |
| download | tor-8136ebba26c08ef54d65ec46dcd4796bb8429b33.tar.gz tor-8136ebba26c08ef54d65ec46dcd4796bb8429b33.zip | |
Merge branch 'maint-0.4.1' into release-0.4.1
| -rw-r--r-- | changes/ticket31772 | 4 | ||||
| -rw-r--r-- | src/feature/control/control_cmd.c | 4 |
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, }; |