]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
[BUG] config: fix erroneous check on cookie domain names
authorWilly Tarreau <w@1wt.eu>
Thu, 3 Dec 2009 22:10:56 +0000 (23:10 +0100)
committerWilly Tarreau <w@1wt.eu>
Sun, 6 Dec 2009 12:24:20 +0000 (13:24 +0100)
It was a OR instead of a AND, so it was required to have a cookie
name which contained a dot AND began with a dot.
(cherry picked from commit a1e107fc13e5d8886bf900f302322bfa6ed35d37)

src/cfgparse.c

index 91a20bdf1dde67fcfd878187ca2b7edba7c4ebad..f7b6a04db22333996b23e05cc55bea38d6f33f0f 100644 (file)
@@ -1454,10 +1454,10 @@ int cfg_parse_listen(const char *file, int linenum, char **args, int kwm)
                                        goto out;
                                }
 
-                               if (*args[cur_arg + 1] != '.' || !strchr(args[cur_arg + 1] + 1, '.')) {
+                               if (*args[cur_arg + 1] != '.' && !strchr(args[cur_arg + 1] + 1, '.')) {
                                        /* rfc2109, 4.3.2 Rejecting Cookies */
                                        Alert("parsing [%s:%d]: domain '%s' contains no embedded"
-                                               " dots or does not start with a dot.\n",
+                                               " dots and does not start with a dot.\n",
                                                file, linenum, args[cur_arg + 1]);
                                        err_code |= ERR_ALERT | ERR_FATAL;
                                        goto out;