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

BUILD: fix usage of ha_alert without format string

Browse Source 
The compilation is failing due to no format string used in ha_alert.
This does not need to be backported.
This commit is contained in:
Amaury Denoyelle 2021-05-07 15:07:21 +02:00
parent a9e639afe2
commit 86c1d0fddb
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cfgparse-global.c
View File

@ -1310,7 +1310,7 @@ int cfg_parse_global(const char *file, int linenum, char **args, int kwm)
continue; continue;
if (strcmp(kwl->kw[index].kw, args[0]) == 0) { if (strcmp(kwl->kw[index].kw, args[0]) == 0) {
if (check_kw_experimental(&kwl->kw[index], file, linenum, &errmsg)) { if (check_kw_experimental(&kwl->kw[index], file, linenum, &errmsg)) {
ha_alert(errmsg); ha_alert("%s\n", errmsg);
err_code |= ERR_ALERT | ERR_FATAL; err_code |= ERR_ALERT | ERR_FATAL;
goto out; goto out;
} }

2
src/cfgparse-listen.c
View File

@ -3041,7 +3041,7 @@ stats_error_parsing:
continue; continue;
if (strcmp(kwl->kw[index].kw, args[0]) == 0) { if (strcmp(kwl->kw[index].kw, args[0]) == 0) {
if (check_kw_experimental(&kwl->kw[index], file, linenum, &errmsg)) { if (check_kw_experimental(&kwl->kw[index], file, linenum, &errmsg)) {
ha_alert(errmsg); ha_alert("%s\n", errmsg);
err_code |= ERR_ALERT | ERR_FATAL; err_code |= ERR_ALERT | ERR_FATAL;
goto out; goto out;
} }

2
src/haproxy.c
View File

@ -269,7 +269,7 @@ int check_kw_experimental(struct cfg_keyword *kw, const char *file, int linenum,
{ {
if (kw->flags & KWF_EXPERIMENTAL) { if (kw->flags & KWF_EXPERIMENTAL) {
if (!experimental_directives_allowed) { if (!experimental_directives_allowed) {
memprintf(errmsg, "parsing [%s:%d] : '%s' directive is experimental, must be allowed via a global 'expose-experimental-directives'\n", memprintf(errmsg, "parsing [%s:%d] : '%s' directive is experimental, must be allowed via a global 'expose-experimental-directives'",
file, linenum, kw->kw); file, linenum, kw->kw);
return 1; return 1;
} }