mirror of
https://github.com/haproxy/haproxy.git
synced 2026-04-15 21:59:41 -04:00
MINOR: ssl/ckch: warn when the same keyword was used twice
When using a crt-list or a crt-store, keywords mentionned twice on the same line overwritte the previous value. This patch emits a warning when the same keyword is found another time on the same line.
This commit is contained in:
parent
9c0c05b7ba
commit
8b0d1a4113
1 changed files with 11 additions and 2 deletions
|
|
@ -4870,7 +4870,12 @@ int ckch_conf_parse(char **args, int cur_arg, struct ckch_conf *f, int *found, c
|
|||
if (ckch_conf_kws[i].type == PARSE_TYPE_STR) {
|
||||
char **t = target;
|
||||
|
||||
ha_free(t);
|
||||
if (*t) {
|
||||
ha_free(t);
|
||||
memprintf(err, "'%s' already specified, overwriting.", ckch_conf_kws[i].name);
|
||||
err_code |= ERR_WARN;
|
||||
}
|
||||
|
||||
*t = strdup(args[cur_arg + 1]);
|
||||
if (!*t) {
|
||||
ha_alert("parsing [%s:%d]: out of memory.\n", file, linenum);
|
||||
|
|
@ -4884,7 +4889,11 @@ int ckch_conf_parse(char **args, int cur_arg, struct ckch_conf *f, int *found, c
|
|||
char *b, *e;
|
||||
|
||||
/* split a string into substring split by colons */
|
||||
ha_freearray(t);
|
||||
if (*t) {
|
||||
ha_freearray(t);
|
||||
memprintf(err, "'%s' already specified, overwriting.", ckch_conf_kws[i].name);
|
||||
err_code |= ERR_WARN;
|
||||
}
|
||||
e = b = args[cur_arg + 1];
|
||||
do {
|
||||
while (*e != ',' && *e != '\0')
|
||||
|
|
|
|||
Loading…
Reference in a new issue