From 22a7ef01aa2c0eb77bcc40174d09104acc35cab1 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Tue, 7 Jun 2016 10:59:46 +0200 Subject: Replace use of opt.homedir by accessor functions. * common/homedir.c (the_gnupg_homedir): New var. (gnupg_set_homedir): New. (gnupg_homedir): New. * g10/options.h (struct opt): Remove 'homedir' and replace all users by the new accessor functions. * g13/g13-common.h (struct opt): Ditto. * scd/scdaemon.h (struct opt): Ditto. * sm/gpgsm.h (struct opt): Ditto. * dirmngr/dirmngr.h (struct opt): Ditto. * agent/preset-passphrase.c (opt_homedir): Ditto. * agent/protect-tool.c (opt_homedir): Ditto. -- This will make detection of a non-default homedir easier. Signed-off-by: Werner Koch --- sm/keydb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sm/keydb.c') diff --git a/sm/keydb.c b/sm/keydb.c index 495eb497f..8a1efd454 100644 --- a/sm/keydb.c +++ b/sm/keydb.c @@ -287,7 +287,7 @@ keydb_add_resource (const char *url, int force, int secret, int *auto_created) if (strchr(resname, DIRSEP_C) ) filename = make_filename (resname, NULL); else - filename = make_filename (opt.homedir, resname, NULL); + filename = make_filename (gnupg_homedir (), resname, NULL); } else filename = xstrdup (resname); -- cgit v1.2.3