MINOR: config: don't open-code proxy name lookups

We can now safely use the standard functions to detect proxy name
duplicates.

diff --git a/src/cfgparse.c b/src/cfgparse.c
index 84420d11f7a97798bebc5cacb32be2b7371709c1..26d2f9145800539c2079b7c2cf1070999a1eaac6 100644 (file)
--- a/src/cfgparse.c
+++ b/src/cfgparse.c
@@ -2114,8 +2114,6 @@ int cfg_parse_listen(const char *file, int linenum, char **args, int kwm)
                rc = PR_CAP_NONE;
 
        if (rc != PR_CAP_NONE) {  /* new proxy */
-               struct ebpt_node *node;
-
                if (!*args[1]) {
                        Alert("parsing [%s:%d] : '%s' expects an <id> argument and\n"
                              "  optionnally supports [addr1]:port1[-end1]{,[addr]:port[-end]}...\n",
@@ -2131,30 +2129,12 @@ int cfg_parse_listen(const char *file, int linenum, char **args, int kwm)
                        err_code |= ERR_ALERT | ERR_FATAL;
                }
 
-               for (node = ebis_lookup(&proxy_by_name, args[1]); node; node = ebpt_next(node)) {
-                       curproxy = container_of(node, struct proxy, conf.by_name);
-
-                       if (strcmp(curproxy->id, args[1]) != 0)
-                               break;
-
-                       /*
-                        * If there are two proxies with the same name only following
-                        * combinations are allowed:
-                        *
-                        *                      listen backend frontend ruleset
-                        *      listen             -      -       -        -
-                        *      backend            -      -       OK       -
-                        *      frontend           -      OK      -        -
-                        *      ruleset            -      -       -        -
-                        */
-
-                       if ((rc != (PR_CAP_FE|PR_CAP_RS) || curproxy->cap != (PR_CAP_BE|PR_CAP_RS)) &&
-                           (rc != (PR_CAP_BE|PR_CAP_RS) || curproxy->cap != (PR_CAP_FE|PR_CAP_RS))) {
-                               Alert("Parsing [%s:%d]: %s '%s' has the same name as another %s declared at %s:%d.\n",
-                                       file, linenum, proxy_cap_str(rc), args[1], proxy_type_str(curproxy),
-                                       curproxy->conf.file, curproxy->conf.line);
+               curproxy = (rc & PR_CAP_FE) ? proxy_fe_by_name(args[1]) : proxy_be_by_name(args[1]);
+               if (curproxy) {
+                       Alert("Parsing [%s:%d]: %s '%s' has the same name as %s '%s' declared at %s:%d.\n",
+                             file, linenum, proxy_cap_str(rc), args[1], proxy_type_str(curproxy),
+                             curproxy->id, curproxy->conf.file, curproxy->conf.line);
                                err_code |= ERR_ALERT | ERR_FATAL;
-                       }
                }
 
                if ((curproxy = (struct proxy *)calloc(1, sizeof(struct proxy))) == NULL) {