mirror of
http://git.haproxy.org/git/haproxy.git
synced 2026-02-10 16:12:40 +02:00
MINOR: acme: copy the original ckch_store
Copy the original ckch_store instead of creating a new one. This allows to inherit the ckch_conf from the previous structure when doing a ckchs_dup(). The ckch_conf contains the SAN for ACME. Free the previous PKEY since it a new one is generated.
This commit is contained in:
@@ -1723,7 +1723,7 @@ static int cli_acme_renew_parse(char **args, char *payload, struct appctx *appct
|
||||
goto err;
|
||||
}
|
||||
|
||||
newstore = ckch_store_new(store->path);
|
||||
newstore = ckchs_dup(store);
|
||||
if (!newstore) {
|
||||
memprintf(&err, "Out of memory.\n");
|
||||
goto err;
|
||||
@@ -1769,6 +1769,7 @@ static int cli_acme_renew_parse(char **args, char *payload, struct appctx *appct
|
||||
|
||||
EVP_PKEY_CTX_free(pkey_ctx);
|
||||
|
||||
EVP_PKEY_free(newstore->data->key);
|
||||
newstore->data->key = pkey;
|
||||
|
||||
ctx->req = acme_x509_req(pkey, store->conf.acme.domains);
|
||||
@@ -1777,8 +1778,6 @@ static int cli_acme_renew_parse(char **args, char *payload, struct appctx *appct
|
||||
goto err;
|
||||
}
|
||||
|
||||
/* XXX: must implement a real copy */
|
||||
newstore->conf = store->conf;
|
||||
|
||||
ctx->store = newstore;
|
||||
ctx->cfg = cfg;
|
||||
|
||||
Reference in New Issue
Block a user