diff options
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 |