From 070d7bf940efa60db2b0734273b9b3736d18338a Mon Sep 17 00:00:00 2001 From: Andre Heinecke Date: Thu, 5 Feb 2015 13:58:50 +0100 Subject: dirmngr: Initialize cache from sysconfig dir * dirmngr/certcache.c (cert_cache_init): Load certificates from sysconfig dir instead of the homeidr. * dirmngr/dirmngr.c (main): Removed parsing of obsolete homedir_data option. * dirmngr/dirmngr.h (opt): Removed homedir_data. * doc/dirmngr.texi: Update and clarify certs directory doc. -- Using the homedir for extra-certs and trusted-certs makes little sense when dirmngr is used with a caller that manages it's own store of certificates and can provide those through the SENDCERT command. You can use trusted-certs and extra-certs to provide users with a base of locally available certificates that are not already in store of the applications. --- dirmngr/certcache.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'dirmngr/certcache.c') diff --git a/dirmngr/certcache.c b/dirmngr/certcache.c index 969b3ec19..7fc982684 100644 --- a/dirmngr/certcache.c +++ b/dirmngr/certcache.c @@ -435,11 +435,11 @@ cert_cache_init (void) init_cache_lock (); acquire_cache_write_lock (); - dname = make_filename (opt.homedir, "trusted-certs", NULL); + dname = make_filename (gnupg_sysconfdir (), "trusted-certs", NULL); load_certs_from_dir (dname, 1); xfree (dname); - dname = make_filename (opt.homedir_data, "extra-certs", NULL); + dname = make_filename (gnupg_sysconfdir (), "extra-certs", NULL); load_certs_from_dir (dname, 0); xfree (dname); -- cgit v1.2.3