mirror of
http://git.haproxy.org/git/haproxy.git/
synced 2025-04-29 14:28:03 +00:00
BUG/MEDIUM: ssl: open the right path for multi-cert bundle
Multi-cert bundle was not working anymore because we tried to open the wrong path.
This commit is contained in:
parent
a64c703374
commit
6e5f2ceead
@ -3182,7 +3182,7 @@ static struct ckch_node *ckchn_load_cert_file(char *path, int multi, char **err)
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (!found) {
|
if (!found) {
|
||||||
memprintf(err, "%sDidn't find any certificate.\n", err && *err ? *err : "");
|
memprintf(err, "%sDidn't find any certificate for bundle '%s'.\n", err && *err ? *err : "", path);
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
/* insert into the ckchn tree */
|
/* insert into the ckchn tree */
|
||||||
@ -3664,7 +3664,7 @@ ignore_entry:
|
|||||||
return cfgerr;
|
return cfgerr;
|
||||||
}
|
}
|
||||||
|
|
||||||
ckchn = ckchn_load_cert_file(fp, 1, err);
|
ckchn = ckchn_load_cert_file(path, 1, err);
|
||||||
if (!ckchn)
|
if (!ckchn)
|
||||||
return 1;
|
return 1;
|
||||||
cfgerr = ssl_sock_load_multi_ckchn(path, ckchn, bind_conf, NULL, NULL, 0, err);
|
cfgerr = ssl_sock_load_multi_ckchn(path, ckchn, bind_conf, NULL, NULL, 0, err);
|
||||||
|
Loading…
Reference in New Issue
Block a user