diff options
| author | Andre Heinecke <[email protected]> | 2015-02-05 12:58:50 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2015-02-12 12:02:53 +0000 |
| commit | 070d7bf940efa60db2b0734273b9b3736d18338a (patch) | |
| tree | a6cd2aa774a477a06bad4180f672e8db5475b4a6 /dirmngr | |
| parent | Post release updates. (diff) | |
| download | gnupg-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 'dirmngr')
| -rw-r--r-- | dirmngr/certcache.c | 4 | ||||
| -rw-r--r-- | dirmngr/dirmngr.c | 3 | ||||
| -rw-r--r-- | dirmngr/dirmngr.h | 1 |
3 files changed, 2 insertions, 6 deletions
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); 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; diff --git a/dirmngr/dirmngr.h b/dirmngr/dirmngr.h index bb368f252..3dd16a348 100644 --- a/dirmngr/dirmngr.h +++ b/dirmngr/dirmngr.h @@ -80,7 +80,6 @@ struct int dry_run; /* don't change any persistent data */ int batch; /* batch mode */ const char *homedir; /* Configuration directory name */ - const char *homedir_data; /* Ditto for data files (/usr/share/dirmngr). */ const char *homedir_cache; /* Ditto for cache files (/var/cache/dirmngr). */ char *config_filename; /* Name of a config file, which will be |