]> 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>
Thu, 3 Dec 2009 22:10:56 +0000 (23:10 +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.

src/cfgparse.c

index a1d2428a27da891677284695742231889d8b543e..fb5b2f5ed595b48ec11486c0f4be231f69bcbce4 100644 (file)
@@ -1285,10 +1285,10 @@ int cfg_parse_listen(const char *file, int linenum, char **args, int inv)
                                        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;