From 01a3f2074044eb623fb350dc8202830181af169a Mon Sep 17 00:00:00 2001 From: Thierry FOURNIER Date: Thu, 10 May 2018 16:41:26 +0200 Subject: [PATCH] BUG/MINOR: spoe: Mistake in error message about SPOE configuration The announced accepted chars are "[a-zA-Z_-.]", but the real accepted alphabet is "[a-zA-Z0-9_.]". Numbers are supported and "-" is not supported. This patch should be backported to 1.8 and 1.7 --- src/flt_spoe.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/flt_spoe.c b/src/flt_spoe.c index 6ac48fc7d..cc6c55e29 100644 --- a/src/flt_spoe.c +++ b/src/flt_spoe.c @@ -3535,7 +3535,7 @@ cfg_parse_spoe_agent(const char *file, int linenum, char **args, int kwm) tmp = args[2]; while (*tmp) { if (!isalnum(*tmp) && *tmp != '_' && *tmp != '.') { - ha_alert("parsing [%s:%d]: '%s %s' only supports [a-zA-Z_-.] chars.\n", + ha_alert("parsing [%s:%d]: '%s %s' only supports [a-zA-Z0-9_.] chars.\n", file, linenum, args[0], args[1]); err_code |= ERR_ALERT | ERR_FATAL; goto out; @@ -3569,7 +3569,7 @@ cfg_parse_spoe_agent(const char *file, int linenum, char **args, int kwm) tmp = args[2]; while (*tmp) { if (!isalnum(*tmp) && *tmp != '_' && *tmp != '.') { - ha_alert("parsing [%s:%d]: '%s %s' only supports [a-zA-Z_-.] chars.\n", + ha_alert("parsing [%s:%d]: '%s %s' only supports [a-zA-Z0-9_.] chars.\n", file, linenum, args[0], args[1]); err_code |= ERR_ALERT | ERR_FATAL; goto out; @@ -3593,7 +3593,7 @@ cfg_parse_spoe_agent(const char *file, int linenum, char **args, int kwm) tmp = args[2]; while (*tmp) { if (!isalnum(*tmp) && *tmp != '_' && *tmp != '.') { - ha_alert("parsing [%s:%d]: '%s %s' only supports [a-zA-Z_-.] chars.\n", + ha_alert("parsing [%s:%d]: '%s %s' only supports [a-zA-Z0-9_.] chars.\n", file, linenum, args[0], args[1]); err_code |= ERR_ALERT | ERR_FATAL; goto out; @@ -3617,7 +3617,7 @@ cfg_parse_spoe_agent(const char *file, int linenum, char **args, int kwm) tmp = args[2]; while (*tmp) { if (!isalnum(*tmp) && *tmp != '_' && *tmp != '.') { - ha_alert("parsing [%s:%d]: '%s %s' only supports [a-zA-Z_-.] chars.\n", + ha_alert("parsing [%s:%d]: '%s %s' only supports [a-zA-Z0-9_.] chars.\n", file, linenum, args[0], args[1]); err_code |= ERR_ALERT | ERR_FATAL; goto out;