mirror of
https://github.com/haproxy/haproxy.git
synced 2026-05-25 10:42:14 -04:00
BUG/MINOR: config/dns: properly fail on duplicate nameserver name detection
In cfg_parse_resolvers(), two duplicate name checks set err_code but lacked 'goto out', allowing execution to fall through and create the duplicate entry. This would result in new resolvers and nameservers to be created after the error was displayed, and a leak of the previous one. It's mostly harmless since we're exiting after such errors. This can be backported if desired.
This commit is contained in:
parent
da4a4976d7
commit
bcb4f9cd4a
1 changed files with 2 additions and 0 deletions
|
|
@ -3712,6 +3712,7 @@ int cfg_parse_resolvers(const char *file, int linenum, char **args, int kwm)
|
|||
ha_alert("Parsing [%s:%d]: resolvers '%s' has same name as another resolvers (declared at %s:%d).\n",
|
||||
file, linenum, args[1], curr_resolvers->conf.file, curr_resolvers->conf.line);
|
||||
err_code |= ERR_ALERT | ERR_ABORT;
|
||||
goto out;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -3749,6 +3750,7 @@ int cfg_parse_resolvers(const char *file, int linenum, char **args, int kwm)
|
|||
ha_alert("Parsing [%s:%d]: nameserver '%s' has same name as another nameserver (declared at %s:%d).\n",
|
||||
file, linenum, args[1], newnameserver->conf.file, newnameserver->conf.line);
|
||||
err_code |= ERR_ALERT | ERR_FATAL;
|
||||
goto out;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue