From 53177c30de870e70607d39a975669a5123719fc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= Date: Wed, 13 Jun 2018 23:13:16 +0300 Subject: [PATCH] Fix runtime listener creation The number of arguments to createListener was incremented but the maximum count was not. Also fixed the parameter types for createListener and alterServer. --- server/modules/routing/debugcli/debugcmd.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/server/modules/routing/debugcli/debugcmd.c b/server/modules/routing/debugcli/debugcmd.c index c5e2b92ad..a5df3657e 100644 --- a/server/modules/routing/debugcli/debugcmd.c +++ b/server/modules/routing/debugcli/debugcmd.c @@ -1197,10 +1197,11 @@ struct subcommand createoptions[] = } }, { - "listener", 2, 12, createListener, + "listener", 2, 13, createListener, "Create a new listener for a service", "Usage: create listener SERVICE NAME [HOST] [PORT] [PROTOCOL] [AUTHENTICATOR] [OPTIONS]\n" " [SSL_KEY] [SSL_CERT] [SSL_CA] [SSL_VERSION] [SSL_VERIFY_DEPTH]\n" + " [SSL_VERIFY_PEER_CERTIFICATE]\n" "\n" "Parameters\n" "SERVICE Service where this listener is added\n" @@ -1215,6 +1216,7 @@ struct subcommand createoptions[] = "SSL_CA Path to CA certificate\n" "SSL_VERSION SSL version (default MAX)\n" "SSL_VERIFY_DEPTH Certificate verification depth\n" + "SSL_VERIFY_PEER_CERTIFICATE Verify peer certificate\n" "\n" "The first two parameters are required, the others are optional.\n" "Any of the optional parameters can also have the value 'default'\n" @@ -1225,6 +1227,7 @@ struct subcommand createoptions[] = ARG_TYPE_SERVICE, ARG_TYPE_STRING, ARG_TYPE_STRING, ARG_TYPE_STRING, ARG_TYPE_STRING, ARG_TYPE_STRING, ARG_TYPE_STRING, ARG_TYPE_STRING, ARG_TYPE_STRING, ARG_TYPE_STRING, ARG_TYPE_STRING, ARG_TYPE_STRING, + ARG_TYPE_STRING, } }, { @@ -1500,7 +1503,8 @@ struct subcommand alteroptions[] = { ARG_TYPE_SERVER, ARG_TYPE_STRING, ARG_TYPE_STRING, ARG_TYPE_STRING, ARG_TYPE_STRING, ARG_TYPE_STRING, ARG_TYPE_STRING, ARG_TYPE_STRING, - ARG_TYPE_STRING, ARG_TYPE_STRING, ARG_TYPE_STRING, ARG_TYPE_STRING + ARG_TYPE_STRING, ARG_TYPE_STRING, ARG_TYPE_STRING, ARG_TYPE_STRING, + ARG_TYPE_STRING, ARG_TYPE_STRING } }, {