hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '2.3' into 2.4.5

Browse Source
This commit is contained in:
Markus Mäkelä
2019-12-19 10:03:35 +02:00
parent 1e4f7145ad a73b183555
commit 4ae22f9991
5 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
server/core/config.cc
View File

@ -317,7 +317,7 @@ const MXS_MODULE_PARAM config_service_params[] =
},
{
CN_PASSWORD, // Not mandatory due to RCAP_TYPE_NO_AUTH
MXS_MODULE_PARAM_STRING
MXS_MODULE_PARAM_PASSWORD
},
{
CN_ENABLE_ROOT_USER,
@ -515,7 +515,7 @@ const MXS_MODULE_PARAM config_monitor_params[] =
},
{
CN_PASSWORD,
MXS_MODULE_PARAM_STRING,
MXS_MODULE_PARAM_PASSWORD,
NULL,
MXS_MODULE_OPT_REQUIRED
},
@ -644,7 +644,7 @@ const MXS_MODULE_PARAM config_server_params[] =
},
{
CN_MONITORPW,
MXS_MODULE_PARAM_STRING
MXS_MODULE_PARAM_PASSWORD
},
{
CN_PERSISTPOOLMAX,
@ -3145,6 +3145,9 @@ const char* param_type_to_str(const MXS_MODULE_PARAM* params, const char* name)
case MXS_MODULE_PARAM_STRING:
return "a string";
case MXS_MODULE_PARAM_PASSWORD:
return "a password string";
case MXS_MODULE_PARAM_QUOTEDSTRING:
return "a quoted string";
@ -3791,6 +3794,10 @@ json_t* param_value_to_json(const MXS_MODULE_PARAM* param_info, const string& na
rval = json_boolean(config_truth_value(value.c_str()));
break;
case MXS_MODULE_PARAM_PASSWORD:
rval = json_string("*****");
break;
default:
rval = json_string(value.c_str());
break;
@ -4468,6 +4475,7 @@ bool config_param_is_valid(const MXS_MODULE_PARAM* params,
break;
case MXS_MODULE_PARAM_STRING:
case MXS_MODULE_PARAM_PASSWORD:
if (*value)
{
valid = true;

2
server/modules/monitor/mariadbmon/mariadbmon.cc
View File

@ -1015,7 +1015,7 @@ extern "C" MXS_MODULE* MXS_CREATE_MODULE()
CN_REPLICATION_USER, MXS_MODULE_PARAM_STRING
},
{
CN_REPLICATION_PASSWORD, MXS_MODULE_PARAM_STRING
CN_REPLICATION_PASSWORD, MXS_MODULE_PARAM_PASSWORD
},
{
CN_REPLICATION_MASTER_SSL, MXS_MODULE_PARAM_BOOL, "false"