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

gpgconf: Fix for --homedir.

Browse Source 
* tools/gpgconf-comp.c (gpg_agent_runtime_change,
scdaemon_runtime_change, dirmngr_runtime_change): Provide the homedir
arguments by --homedir when it's not default.

--
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2016-10-17 11:36:45 +09:00
parent 0b0f9a3788
commit 70a8584ec4
1 changed files with 60 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
tools/gpgconf-comp.c
View File

@ -1088,33 +1088,48 @@ struct error_line_s
static void static void
gpg_agent_runtime_change (int killflag) gpg_agent_runtime_change (int killflag)
{ {
gpg_error_t err; gpg_error_t err = 0;
const char *pgmname; const char *pgmname;
const char *argv[3]; const char *argv[5];
pid_t pid; pid_t pid;
char *abs_homedir = NULL;
int i = 0;
pgmname = gnupg_module_name (GNUPG_MODULE_NAME_CONNECT_AGENT); pgmname = gnupg_module_name (GNUPG_MODULE_NAME_CONNECT_AGENT);
argv[0] = "--no-autostart"; if (!gnupg_default_homedir_p ())
argv[1] = killflag? "KILLAGENT" : "RELOADAGENT"; {
argv[2] = NULL; abs_homedir = make_absfilename_try (gnupg_homedir (), NULL);
if (!abs_homedir)
err = gpg_error_from_syserror ();
err = gnupg_spawn_process_fd (pgmname, argv, -1, -1, -1, &pid); argv[i++] = "--homedir";
argv[i++] = abs_homedir;
}
argv[i++] = "--no-autostart";
argv[i++] = killflag? "KILLAGENT" : "RELOADAGENT";
argv[i++] = NULL;
if (!err)
err = gnupg_spawn_process_fd (pgmname, argv, -1, -1, -1, &pid);
if (!err) if (!err)
err = gnupg_wait_process (pgmname, pid, 1, NULL); err = gnupg_wait_process (pgmname, pid, 1, NULL);
if (err) if (err)
gc_error (0, 0, "error running '%s %s': %s", gc_error (0, 0, "error running '%s %s': %s",
pgmname, argv[1], gpg_strerror (err)); pgmname, argv[1], gpg_strerror (err));
gnupg_release_process (pid); gnupg_release_process (pid);
xfree (abs_homedir);
} }
static void static void
scdaemon_runtime_change (int killflag) scdaemon_runtime_change (int killflag)
{ {
gpg_error_t err; gpg_error_t err = 0;
const char *pgmname; const char *pgmname;
const char *argv[7]; const char *argv[9];
pid_t pid; pid_t pid;
char *abs_homedir = NULL;
int i = 0;
(void)killflag; /* For scdaemon kill and reload are synonyms. */ (void)killflag; /* For scdaemon kill and reload are synonyms. */
@ -1124,45 +1139,70 @@ scdaemon_runtime_change (int killflag)
obviously a race condition but that should not harm too much. */ obviously a race condition but that should not harm too much. */
pgmname = gnupg_module_name (GNUPG_MODULE_NAME_CONNECT_AGENT); pgmname = gnupg_module_name (GNUPG_MODULE_NAME_CONNECT_AGENT);
argv[0] = "-s"; if (!gnupg_default_homedir_p ())
argv[1] = "--no-autostart"; {
argv[2] = "GETINFO scd_running"; abs_homedir = make_absfilename_try (gnupg_homedir (), NULL);
argv[3] = "/if ${! $?}"; if (!abs_homedir)
argv[4] = "scd killscd"; err = gpg_error_from_syserror ();
argv[5] = "/end";
argv[6] = NULL;
err = gnupg_spawn_process_fd (pgmname, argv, -1, -1, -1, &pid); argv[i++] = "--homedir";
argv[i++] = abs_homedir;
}
argv[i++] = "-s";
argv[i++] = "--no-autostart";
argv[i++] = "GETINFO scd_running";
argv[i++] = "/if ${! $?}";
argv[i++] = "scd killscd";
argv[i++] = "/end";
argv[i++] = NULL;
if (!err)
err = gnupg_spawn_process_fd (pgmname, argv, -1, -1, -1, &pid);
if (!err) if (!err)
err = gnupg_wait_process (pgmname, pid, 1, NULL); err = gnupg_wait_process (pgmname, pid, 1, NULL);
if (err) if (err)
gc_error (0, 0, "error running '%s %s': %s", gc_error (0, 0, "error running '%s %s': %s",
pgmname, argv[4], gpg_strerror (err)); pgmname, argv[4], gpg_strerror (err));
gnupg_release_process (pid); gnupg_release_process (pid);
xfree (abs_homedir);
} }
static void static void
dirmngr_runtime_change (int killflag) dirmngr_runtime_change (int killflag)
{ {
gpg_error_t err; gpg_error_t err = 0;
const char *pgmname; const char *pgmname;
const char *argv[4]; const char *argv[6];
pid_t pid; pid_t pid;
char *abs_homedir = NULL;
pgmname = gnupg_module_name (GNUPG_MODULE_NAME_CONNECT_AGENT); pgmname = gnupg_module_name (GNUPG_MODULE_NAME_CONNECT_AGENT);
argv[0] = "--no-autostart"; argv[0] = "--no-autostart";
argv[1] = "--dirmngr"; argv[1] = "--dirmngr";
argv[2] = killflag? "KILLDIRMNGR" : "RELOADDIRMNGR"; argv[2] = killflag? "KILLDIRMNGR" : "RELOADDIRMNGR";
argv[3] = NULL; if (gnupg_default_homedir_p ())
argv[3] = NULL;
else
{
abs_homedir = make_absfilename_try (gnupg_homedir (), NULL);
if (!abs_homedir)
err = gpg_error_from_syserror ();
err = gnupg_spawn_process_fd (pgmname, argv, -1, -1, -1, &pid); argv[3] = "--homedir";
argv[4] = abs_homedir;
argv[5] = NULL;
}
if (!err)
err = gnupg_spawn_process_fd (pgmname, argv, -1, -1, -1, &pid);
if (!err) if (!err)
err = gnupg_wait_process (pgmname, pid, 1, NULL); err = gnupg_wait_process (pgmname, pid, 1, NULL);
if (err) if (err)
gc_error (0, 0, "error running '%s %s': %s", gc_error (0, 0, "error running '%s %s': %s",
pgmname, argv[2], gpg_strerror (err)); pgmname, argv[2], gpg_strerror (err));
gnupg_release_process (pid); gnupg_release_process (pid);
xfree (abs_homedir);
} }