Merge branch '2.3' into 2.4.5

This commit is contained in:
Markus Mäkelä
2019-12-19 10:03:35 +02:00
5 changed files with 18 additions and 9 deletions

View File

@ -80,6 +80,7 @@ enum mxs_module_param_type
MXS_MODULE_PARAM_BOOL, /**< Boolean value */
MXS_MODULE_PARAM_STRING, /**< String value */
MXS_MODULE_PARAM_QUOTEDSTRING, /**< String enclosed in '"':s */
MXS_MODULE_PARAM_PASSWORD, /**< Password value that is masked in all output */
MXS_MODULE_PARAM_ENUM, /**< Enumeration of string values */
MXS_MODULE_PARAM_PATH, /**< Path to a file or a directory */
MXS_MODULE_PARAM_SERVICE, /**< Service name */
@ -245,6 +246,9 @@ static inline const char* mxs_module_param_type_to_string(enum mxs_module_param_
case MXS_MODULE_PARAM_STRING:
return "string";
case MXS_MODULE_PARAM_PASSWORD:
return "password string";
case MXS_MODULE_PARAM_QUOTEDSTRING:
return "quoted string";