mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-10 09:07:02 +02:00
Code Issues Projects Releases Wiki Activity

BUG/MINOR: resolvers: return the correct value in resolvers_finalize_config()

Browse Source 
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.
This commit is contained in:
William Lallemand 2022-08-24 09:58:31 +02:00
parent 02fd3caa8f
commit 866b88bc95
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/resolvers.c
View File

@ -2481,7 +2481,7 @@ static void resolvers_deinit(void)
/* Finalizes the DNS configuration by allocating required resources and checking /* Finalizes the DNS configuration by allocating required resources and checking
* live parameters. * live parameters.
* Returns 0 on success, ERR_* flags otherwise. * Returns 0 on success, 1 on error.
*/ */
static int resolvers_finalize_config(void) static int resolvers_finalize_config(void)
{ {
@ -2594,11 +2594,11 @@ static int resolvers_finalize_config(void)
goto err; goto err;
leave_resolver_code(); leave_resolver_code();
return err_code; return 0;
err: err:
leave_resolver_code(); leave_resolver_code();
resolvers_deinit(); resolvers_deinit();
return err_code; return 1;
} }