]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
BUG/MINOR: spoe: Mistake in error message about SPOE configuration
authorThierry FOURNIER <thierry.fournier@ozon.io>
Thu, 10 May 2018 14:41:26 +0000 (16:41 +0200)
committerWilly Tarreau <w@1wt.eu>
Fri, 18 May 2018 11:50:40 +0000 (13:50 +0200)
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

index 6ac48fc7d23e575b02b98ccd3be1cad84785d3f9..cc6c55e293e41cda5a23cd82d72c564434ca122b 100644 (file)
@@ -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;