aboutsummaryrefslogtreecommitdiffstats
path: root/dirmngr/dirmngr.c
diff options
context:
space:
mode:
authorAndre Heinecke <[email protected]>2015-02-05 12:58:50 +0000
committerWerner Koch <[email protected]>2015-02-12 12:02:53 +0000
commit070d7bf940efa60db2b0734273b9b3736d18338a (patch)
treea6cd2aa774a477a06bad4180f672e8db5475b4a6 /dirmngr/dirmngr.c
parentPost release updates. (diff)
downloadgnupg-070d7bf940efa60db2b0734273b9b3736d18338a.tar.gz
gnupg-070d7bf940efa60db2b0734273b9b3736d18338a.zip
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.
Diffstat (limited to '')
-rw-r--r--dirmngr/dirmngr.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/dirmngr/dirmngr.c b/dirmngr/dirmngr.c
index fd31b7f93..36a476aa6 100644
--- a/dirmngr/dirmngr.c
+++ b/dirmngr/dirmngr.c
@@ -800,7 +800,6 @@ main (int argc, char **argv)
#else
opt.homedir = gnupg_sysconfdir ();
#endif
- opt.homedir_data = gnupg_datadir ();
opt.homedir_cache = gnupg_cachedir ();
socket_name = dirmngr_sys_socket_name ();
}
@@ -926,8 +925,6 @@ main (int argc, char **argv)
if (nogreeting )
greeting = 0;
- if (!opt.homedir_data)
- opt.homedir_data = opt.homedir;
if (!opt.homedir_cache)
opt.homedir_cache = opt.homedir;