]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
[MINOR] config: don't report error on all subsequent files on failure
authorWilly Tarreau <w@1wt.eu>
Tue, 15 Dec 2009 20:46:25 +0000 (21:46 +0100)
committerWilly Tarreau <w@1wt.eu>
Tue, 15 Dec 2009 20:46:25 +0000 (21:46 +0100)
Cyril Bonté found that when an error is detected in one config file, it
is also reported in all other ones, which is wrong. The fix obviously
consists in checking the return code from readcfgfile() and not the
accumulator.

src/haproxy.c

index c5558ca40da217687e57cb410f6de9c06cfabc47..71537d02fd8bdce02cd4d1c16348822d55859824 100644 (file)
@@ -549,9 +549,9 @@ void init(int argc, char **argv)
                              cfg_cfgfile[i], strerror(errno));
                        exit(1);
                }
-               err_code |= ret;
-               if (err_code & (ERR_ABORT|ERR_FATAL))
+               if (ret & (ERR_ABORT|ERR_FATAL))
                        Alert("Error(s) found in configuration file : %s\n", cfg_cfgfile[i]);
+               err_code |= ret;
                if (err_code & ERR_ABORT)
                        exit(1);
        }