diff options
| author | Werner Koch <[email protected]> | 2018-05-13 11:29:40 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2018-05-13 11:29:40 +0000 |
| commit | 7b7576637ddfb6e426e77a86b05af6d828e585d5 (patch) | |
| tree | 21919eed435194f8db1dac8150b581a731a66e26 /dirmngr/certcache.c | |
| parent | doc: Include release info from 2.2.6 (diff) | |
| parent | doc: Fix URL in NEWS. (diff) | |
| download | gnupg-7b7576637ddfb6e426e77a86b05af6d828e585d5.tar.gz gnupg-7b7576637ddfb6e426e77a86b05af6d828e585d5.zip | |
Merge branch 'STABLE-BRANCH-2-2' into master
--
Resolved Conflicts:
NEWS - removed
configure.ac - removed
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'dirmngr/certcache.c')
| -rw-r--r-- | dirmngr/certcache.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/dirmngr/certcache.c b/dirmngr/certcache.c index 56629fdda..adb005ec8 100644 --- a/dirmngr/certcache.c +++ b/dirmngr/certcache.c @@ -423,6 +423,9 @@ load_certs_from_dir (const char *dirname, unsigned int trustclass) log_info (_("certificate '%s' already cached\n"), fname); else if (!err) { + if ((trustclass & CERTTRUST_CLASS_CONFIG)) + http_register_cfg_ca (fname); + if (trustclass) log_info (_("trusted certificate '%s' loaded\n"), fname); else @@ -763,6 +766,8 @@ cert_cache_deinit (int full) } } + http_register_cfg_ca (NULL); + total_nonperm_certificates = 0; any_cert_of_class = 0; initialization_done = 0; |