security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-03 12:11:33 +01:00
Code Activity

agent: invoke scdaemon with --homedir.

Browse Source 
* agent/call-scd.c (start_scd): Supply --homedir option when it's not
default homedir.

--

Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2016-09-02 13:41:19 +09:00
parent afdfc954b3
commit 8b6c0bae33
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
agent/call-scd.c
View File

@ -195,10 +195,11 @@ start_scd (ctrl_t ctrl)
gpg_error_t err = 0; gpg_error_t err = 0;
const char *pgmname; const char *pgmname;
assuan_context_t ctx = NULL; assuan_context_t ctx = NULL;
const char *argv[3]; const char *argv[5];
assuan_fd_t no_close_list[3]; assuan_fd_t no_close_list[3];
int i; int i;
int rc; int rc;
char *abs_homedir = NULL;
if (opt.disable_scdaemon) if (opt.disable_scdaemon)
return gpg_error (GPG_ERR_NOT_SUPPORTED); return gpg_error (GPG_ERR_NOT_SUPPORTED);
@ -313,7 +314,22 @@ start_scd (ctrl_t ctrl)
argv[0] = pgmname; argv[0] = pgmname;
argv[1] = "--multi-server"; argv[1] = "--multi-server";
argv[2] = NULL; if (gnupg_default_homedir_p ())
argv[2] = NULL;
else
{
abs_homedir = make_absfilename_try (gnupg_homedir (), NULL);
if (!abs_homedir)
{
log_error ("error building filename: %s\n",
gpg_strerror (gpg_error_from_syserror ()));
goto leave;
}
argv[2] = "--homedir";
argv[3] = abs_homedir;
argv[4] = NULL;
}
i=0; i=0;
if (!opt.running_detached) if (!opt.running_detached)
@ -393,6 +409,7 @@ start_scd (ctrl_t ctrl)
primary_scd_ctx_reusable = 0; primary_scd_ctx_reusable = 0;
leave: leave:
xfree (abs_homedir);
if (err) if (err)
{ {
unlock_scd (ctrl, err); unlock_scd (ctrl, err);