From 09a445f1b7fef172619b5fab3b762826067b0b16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= Date: Fri, 2 Jun 2017 18:59:57 +0300 Subject: [PATCH] Fix monitor credentials parameter names The `monitoruser` and `monitorpw` parameters were mislabeled as `monuser` and `monpw`. To allow backwards compatibility, the `monuser` and `monpw` still work as aliases for the correct commands. --- server/core/config_runtime.c | 14 ++++++++++++-- server/modules/routing/debugcli/debugcmd.c | 4 ++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/server/core/config_runtime.c b/server/core/config_runtime.c index a84e77fb6..98d4d312e 100644 --- a/server/core/config_runtime.c +++ b/server/core/config_runtime.c @@ -280,12 +280,22 @@ bool runtime_alter_server(SERVER *server, char *key, char *value) { server_update_port(server, atoi(value)); } - else if (strcmp(key, "monuser") == 0) + else if (strcmp(key, "monuser") == 0 || strcmp(key, "monitoruser") == 0) { + if (strcmp(key, "monuser") == 0) + { + MXS_WARNING("Use of `monuser` is deprecated, use `monitoruser` instead."); + } + server_update_credentials(server, value, server->monpw); } - else if (strcmp(key, "monpw") == 0) + else if (strcmp(key, "monpw") == 0 || strcmp(key, "monitorpw") == 0) { + if (strcmp(key, "monpw") == 0) + { + MXS_WARNING("Use of `monpw` is deprecated, use `monitorpw` instead."); + } + server_update_credentials(server, server->monuser, value); } else diff --git a/server/modules/routing/debugcli/debugcmd.c b/server/modules/routing/debugcli/debugcmd.c index abd8355a4..a221874ca 100644 --- a/server/modules/routing/debugcli/debugcmd.c +++ b/server/modules/routing/debugcli/debugcmd.c @@ -1495,8 +1495,8 @@ struct subcommand alteroptions[] = "\n" "address Server address\n" "port Server port\n" - "monuser Monitor user for this server\n" - "monpw Monitor password for this server\n" + "monitoruser Monitor user for this server\n" + "monitorpw Monitor password for this server\n" "ssl Enable SSL, value must be 'required'\n" "ssl_key Path to SSL private key\n" "ssl_cert Path to SSL certificate\n"