diff options
| author | Gilles Chehade <gilles@cvs.openbsd.org> | 2015-12-12 10:48:44 +0000 |
|---|---|---|
| committer | Gilles Chehade <gilles@cvs.openbsd.org> | 2015-12-12 10:48:44 +0000 |
| commit | d0c8c60ad2179876dd2bf54a4f6a82c1ca426902 (patch) | |
| tree | 78c5a6c7188272684d42fc544338319285ca5001 /usr.sbin/smtpd | |
| parent | c13fa251f027e1a105890118763b4a9819103ef3 (diff) | |
prepare load_pki_tree() for pki/ca split
Diffstat (limited to 'usr.sbin/smtpd')
| -rw-r--r-- | usr.sbin/smtpd/smtpd.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/usr.sbin/smtpd/smtpd.c b/usr.sbin/smtpd/smtpd.c index 154c952777f..d03f0138fe7 100644 --- a/usr.sbin/smtpd/smtpd.c +++ b/usr.sbin/smtpd/smtpd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: smtpd.c,v 1.263 2015/12/12 10:26:57 sunil Exp $ */ +/* $OpenBSD: smtpd.c,v 1.264 2015/12/12 10:48:43 gilles Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@poolp.org> @@ -714,6 +714,7 @@ static void load_pki_tree(void) { struct pki *pki; + struct ca *sca; const char *k; void *iter_dict; @@ -736,6 +737,16 @@ load_pki_tree(void) if (! ssl_load_dhparams(pki, pki->pki_dhparams_file)) fatalx("load_pki_tree: failed to load dhparams file"); } + + log_debug("debug: init ca-tree"); + iter_dict = NULL; + while (dict_iter(env->sc_ca_dict, &iter_dict, &k, (void **)&sca)) { + log_debug("info: loading CA information for %s", k); + /* + * if (! ssl_load_cafile(sca, sca->ca_cert_file)) + * fatalx("load_pki_tree: failed to load CA file"); + */ + } } void |