diff options
| author |   benno <benno@openbsd.org> | 2017-01-21 09:00:29 +0000 |
|---|---|---|
| committer | benno <benno@openbsd.org> | 2017-01-21 09:00:29 +0000 |
| commit | 70bcb874bc768cb3c938efa766a46eb3d8cdaf29 (patch) | |
| tree | b6855fbb9fb6836441931a003719e94a00ebe170 /usr.sbin/acme-client/main.c | |
| parent | document default challengedir "/var/www/acme" (diff) | |
| download | wireguard-openbsd-70bcb874bc768cb3c938efa766a46eb3d8cdaf29.tar.xz wireguard-openbsd-70bcb874bc768cb3c938efa766a46eb3d8cdaf29.zip | |
add option 'domain full chain certificate "path"',
revokation works, the fullchain file will be unlinked.
ok florian
Diffstat (limited to 'usr.sbin/acme-client/main.c')
| -rw-r--r-- | usr.sbin/acme-client/main.c | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/usr.sbin/acme-client/main.c b/usr.sbin/acme-client/main.c index 1c6067488ca..35c47d4a487 100644 --- a/usr.sbin/acme-client/main.c +++ b/usr.sbin/acme-client/main.c @@ -1,4 +1,4 @@ -/* $Id: main.c,v 1.25 2017/01/21 08:55:09 florian Exp $ */ +/* $Id: main.c,v 1.26 2017/01/21 09:00:29 benno Exp $ */ /* * Copyright (c) 2016 Kristaps Dzonsons <kristaps@bsd.lv> * @@ -36,7 +36,8 @@ int main(int argc, char *argv[]) { const char **alts = NULL; - char *certdir = NULL, *certfile = NULL, *chainfile = NULL; + char *certdir = NULL, *certfile = NULL; + char *chainfile = NULL, *fullchainfile = NULL; char *acctkey = NULL; char *chngdir = NULL, *auth = NULL, *agreement = NULL; char *conffile = CONF_FILE; @@ -129,6 +130,16 @@ main(int argc, char *argv[]) err(EXIT_FAILURE, "strdup"); } + if(domain->fullchain != NULL) { + if ((fullchainfile = strstr(domain->fullchain, certdir)) != NULL) + fullchainfile = domain->fullchain + strlen(certdir); + else + fullchainfile = domain->fullchain; + + if ((fullchainfile = strdup(fullchainfile)) == NULL) + err(EXIT_FAILURE, "strdup"); + } + if ((auth = domain->auth) == NULL) { /* use the first authority from the config as default XXX */ authority = authority_find0(conf); @@ -347,7 +358,8 @@ main(int argc, char *argv[]) free(alts); close(dns_fds[0]); close(rvk_fds[0]); - c = fileproc(file_fds[1], certdir, certfile, chainfile, NULL); + c = fileproc(file_fds[1], certdir, certfile, chainfile, + fullchainfile); /* * This is different from the other processes in that it * can return 2 if the certificates were updated. |