mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-26 16:21:22 +02:00
Code Issues Projects Releases Wiki Activity

BUG/MINOR: resolvers: shut off the warning for the default resolvers

Browse Source 
When the resolv.conf file is empty or there is no resolv.conf file, an
empty resolvers will be created, which emits a warning during the
postparsing step.

This patch fixes the problem by freeing the resolvers section if the
parsing failed or if the nameserver list is empty.

Must be backported in 2.6, the previous patch which introduces
resolvers_destroy() is also required.
This commit is contained in:
William Lallemand 2022-07-18 14:12:17 +02:00
parent e606c84fee
commit 3bda80789c
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/resolvers.c
View File

@ -3671,13 +3671,31 @@ int resolvers_create_default()
{ {
int err_code = 0; int err_code = 0;
/* if the section already exists, do nothing */
if (find_resolvers_by_id("default")) if (find_resolvers_by_id("default"))
return 0; return 0;
curr_resolvers = NULL;
err_code |= resolvers_new(&curr_resolvers, "default", "<internal>", 0); err_code |= resolvers_new(&curr_resolvers, "default", "<internal>", 0);
if (!(err_code & ERR_CODE)) if (err_code & ERR_CODE)
err_code |= parse_resolve_conf(NULL, NULL); goto err;
err_code |= parse_resolve_conf(NULL, NULL);
if (err_code & ERR_CODE)
goto err;
/* check if there was any nameserver in the resolvconf file */
if (LIST_ISEMPTY(&curr_resolvers->nameservers)) {
err_code |= ERR_FATAL;
goto err;
}
err:
if (err_code & ERR_CODE) {
resolvers_destroy(curr_resolvers);
curr_resolvers = NULL;
}
/* we never return an error there, we only try to create this section
* if that's possible */
return 0; return 0;
} }