BUG/MINOR: resolvers: return the correct value in resolvers_finalize_config()
Patch c31577f ("MEDIUM: resolvers: continue startup if network is
unavailable") was not working correctly. Indeed
resolvers_finalize_config() was returning a ERR type, but a postparser
is supposed to return 0 or 1.
The return value was never right, however it was only a problem since c31577f.
Must be backported in every stable branch.
(cherry picked from commit 866b88bc95d19c06633fc57a577e5aaf57baf23c)
Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>
(cherry picked from commit 292a7cdc766a4bac8f1bf94c3150b37d7fb41cd1)
Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>
(cherry picked from commit e4593a1157ffaad49504974342de1f2519995c0a)
Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>
diff --git a/src/resolvers.c b/src/resolvers.c
index 87f22f1..5f5b48f 100644
--- a/src/resolvers.c
+++ b/src/resolvers.c
@@ -2491,7 +2491,7 @@
/* Finalizes the DNS configuration by allocating required resources and checking
* live parameters.
- * Returns 0 on success, ERR_* flags otherwise.
+ * Returns 0 on success, 1 on error.
*/
static int resolvers_finalize_config(void)
{
@@ -2602,11 +2602,11 @@
goto err;
leave_resolver_code();
- return err_code;
+ return 0;
err:
leave_resolver_code();
resolvers_deinit();
- return err_code;
+ return 1;
}