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/server.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sm/server.c') diff --git a/sm/server.c b/sm/server.c index a43ff3472..8b4a29c87 100644 --- a/sm/server.c +++ b/sm/server.c @@ -1308,7 +1308,7 @@ gpgsm_server (certlist_t default_recplist) } if (opt.verbose || opt.debug) { - char *tmp = NULL; + char *tmp; /* Fixme: Use the really used socket name. */ if (asprintf (&tmp, @@ -1316,7 +1316,7 @@ gpgsm_server (certlist_t default_recplist) "Config: %s\n" "DirmngrInfo: %s\n" "%s", - opt.homedir, + gnupg_homedir (), opt.config_filename, (dirmngr_user_socket_name () ? dirmngr_user_socket_name () -- cgit v1.2.3