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 --- agent/command-ssh.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'agent/command-ssh.c') diff --git a/agent/command-ssh.c b/agent/command-ssh.c index 0e1d9fc9f..e3cd4b9b8 100644 --- a/agent/command-ssh.c +++ b/agent/command-ssh.c @@ -897,7 +897,7 @@ open_control_file (ssh_control_file_t *r_cf, int append) /* Note: As soon as we start to use non blocking functions here (i.e. where Pth might switch threads) we need to employ a mutex. */ - cf->fname = make_filename_try (opt.homedir, SSH_CONTROL_FILE_NAME, NULL); + cf->fname = make_filename_try (gnupg_homedir (), SSH_CONTROL_FILE_NAME, NULL); if (!cf->fname) { err = gpg_error_from_syserror (); @@ -2734,7 +2734,7 @@ ssh_handler_request_identities (ctrl_t ctrl, { char *dname; - dname = make_filename (opt.homedir, GNUPG_PRIVATE_KEYS_DIR, NULL); + dname = make_filename (gnupg_homedir (), GNUPG_PRIVATE_KEYS_DIR, NULL); if (!dname) { err = gpg_err_code_from_syserror (); -- cgit v1.2.3