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

common: Remove homedir arg from start_new_{dirmngr,gpg_agent}.

Browse Source 
* common/asshelp.c (start_new_gpg_agent): Remove arg 'homedir' in
favor of gnupg_homedir ().  Change all callers.
(start_new_dirmngr): Ditto.
* common/get-passphrase.c (gnupg_prepare_get_passphrase): Remove arg
'homedir'.

Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2016-06-07 13:09:00 +02:00
parent 22a7ef01aa
commit fb88f37c40
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
11 changed files with 6 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
agent/protect-tool.c
View File

@ -630,7 +630,6 @@ main (int argc, char **argv )
/* Set the information which can't be taken from envvars. */ /* Set the information which can't be taken from envvars. */
gnupg_prepare_get_passphrase (GPG_ERR_SOURCE_DEFAULT, gnupg_prepare_get_passphrase (GPG_ERR_SOURCE_DEFAULT,
opt.verbose, opt.verbose,
gnupg_homedir (),
opt_agent_program, opt_agent_program,
NULL, NULL, NULL); NULL, NULL, NULL);

13
common/asshelp.c
View File

@ -351,7 +351,6 @@ unlock_spawning (lock_spawn_t *lock, const char *name)
gpg_error_t gpg_error_t
start_new_gpg_agent (assuan_context_t *r_ctx, start_new_gpg_agent (assuan_context_t *r_ctx,
gpg_err_source_t errsource, gpg_err_source_t errsource,
const char *homedir,
const char *agent_program, const char *agent_program,
const char *opt_lc_ctype, const char *opt_lc_ctype,
const char *opt_lc_messages, const char *opt_lc_messages,
@ -375,7 +374,7 @@ start_new_gpg_agent (assuan_context_t *r_ctx,
return err; return err;
} }
sockname = make_absfilename (homedir, GPG_AGENT_SOCK_NAME, NULL); sockname = make_absfilename (gnupg_homedir (), GPG_AGENT_SOCK_NAME, NULL);
err = assuan_socket_connect (ctx, sockname, 0, 0); err = assuan_socket_connect (ctx, sockname, 0, 0);
if (err && autostart) if (err && autostart)
{ {
@ -418,7 +417,7 @@ start_new_gpg_agent (assuan_context_t *r_ctx,
/* We better pass an absolute home directory to the agent just /* We better pass an absolute home directory to the agent just
in case gpg-agent does not convert the passed name to an in case gpg-agent does not convert the passed name to an
absolute one (which it should do). */ absolute one (which it should do). */
abs_homedir = make_absfilename_try (homedir, NULL); abs_homedir = make_absfilename_try (gnupg_homedir (), NULL);
if (!abs_homedir) if (!abs_homedir)
{ {
gpg_error_t tmperr = gpg_err_make (errsource, gpg_error_t tmperr = gpg_err_make (errsource,
@ -455,7 +454,7 @@ start_new_gpg_agent (assuan_context_t *r_ctx,
argv[i++] = "--daemon"; argv[i++] = "--daemon";
argv[i++] = NULL; argv[i++] = NULL;
if (!(err = lock_spawning (&lock, homedir, "agent", verbose)) if (!(err = lock_spawning (&lock, gnupg_homedir (), "agent", verbose))
&& assuan_socket_connect (ctx, sockname, 0, 0)) && assuan_socket_connect (ctx, sockname, 0, 0))
{ {
err = gnupg_spawn_process_detached (program? program : agent_program, err = gnupg_spawn_process_detached (program? program : agent_program,
@ -538,7 +537,6 @@ start_new_gpg_agent (assuan_context_t *r_ctx,
gpg_error_t gpg_error_t
start_new_dirmngr (assuan_context_t *r_ctx, start_new_dirmngr (assuan_context_t *r_ctx,
gpg_err_source_t errsource, gpg_err_source_t errsource,
const char *homedir,
const char *dirmngr_program, const char *dirmngr_program,
int autostart, int autostart,
int verbose, int debug, int verbose, int debug,
@ -605,7 +603,7 @@ start_new_dirmngr (assuan_context_t *r_ctx,
status_cb (status_cb_arg, STATUS_PROGRESS, status_cb (status_cb_arg, STATUS_PROGRESS,
"starting_dirmngr ? 0 0", NULL); "starting_dirmngr ? 0 0", NULL);
abs_homedir = make_absfilename (homedir, NULL); abs_homedir = make_absfilename (gnupg_homedir (), NULL);
if (!abs_homedir) if (!abs_homedir)
{ {
gpg_error_t tmperr = gpg_err_make (errsource, gpg_error_t tmperr = gpg_err_make (errsource,
@ -641,7 +639,7 @@ start_new_dirmngr (assuan_context_t *r_ctx,
TRY_SYSTEM_DAEMON should never be true because TRY_SYSTEM_DAEMON should never be true because
dirmngr_user_socket_name() won't return NULL. */ dirmngr_user_socket_name() won't return NULL. */
if (!(err = lock_spawning (&lock, homedir, "dirmngr", verbose)) if (!(err = lock_spawning (&lock, gnupg_homedir (), "dirmngr", verbose))
&& assuan_socket_connect (ctx, sockname, 0, 0)) && assuan_socket_connect (ctx, sockname, 0, 0))
{ {
err = gnupg_spawn_process_detached (dirmngr_program, argv, NULL); err = gnupg_spawn_process_detached (dirmngr_program, argv, NULL);
@ -678,7 +676,6 @@ start_new_dirmngr (assuan_context_t *r_ctx,
xfree (abs_homedir); xfree (abs_homedir);
} }
#else #else
(void)homedir;
(void)dirmngr_program; (void)dirmngr_program;
(void)verbose; (void)verbose;
(void)status_cb; (void)status_cb;

2
common/asshelp.h
View File

@ -54,7 +54,6 @@ send_pinentry_environment (assuan_context_t ctx,
gpg_error_t gpg_error_t
start_new_gpg_agent (assuan_context_t *r_ctx, start_new_gpg_agent (assuan_context_t *r_ctx,
gpg_err_source_t errsource, gpg_err_source_t errsource,
const char *homedir,
const char *agent_program, const char *agent_program,
const char *opt_lc_ctype, const char *opt_lc_ctype,
const char *opt_lc_messages, const char *opt_lc_messages,
@ -68,7 +67,6 @@ start_new_gpg_agent (assuan_context_t *r_ctx,
gpg_error_t gpg_error_t
start_new_dirmngr (assuan_context_t *r_ctx, start_new_dirmngr (assuan_context_t *r_ctx,
gpg_err_source_t errsource, gpg_err_source_t errsource,
const char *homedir,
const char *dirmngr_program, const char *dirmngr_program,
int autostart, int verbose, int debug, int autostart, int verbose, int debug,
gpg_error_t (*status_cb)(ctrl_t, int, ...), gpg_error_t (*status_cb)(ctrl_t, int, ...),

4
common/get-passphrase.c
View File

@ -47,7 +47,6 @@ static struct
{ {
gpg_err_source_t errsource; gpg_err_source_t errsource;
int verbosity; int verbosity;
const char *homedir;
const char *agent_program; const char *agent_program;
const char *lc_ctype; const char *lc_ctype;
const char *lc_messages; const char *lc_messages;
@ -62,7 +61,6 @@ static struct
void void
gnupg_prepare_get_passphrase (gpg_err_source_t errsource, gnupg_prepare_get_passphrase (gpg_err_source_t errsource,
int verbosity, int verbosity,
const char *homedir,
const char *agent_program, const char *agent_program,
const char *opt_lc_ctype, const char *opt_lc_ctype,
const char *opt_lc_messages, const char *opt_lc_messages,
@ -70,7 +68,6 @@ gnupg_prepare_get_passphrase (gpg_err_source_t errsource,
{ {
agentargs.errsource = errsource; agentargs.errsource = errsource;
agentargs.verbosity = verbosity; agentargs.verbosity = verbosity;
agentargs.homedir = homedir;
agentargs.agent_program = agent_program; agentargs.agent_program = agent_program;
agentargs.lc_ctype = opt_lc_ctype; agentargs.lc_ctype = opt_lc_ctype;
agentargs.lc_messages = opt_lc_messages; agentargs.lc_messages = opt_lc_messages;
@ -93,7 +90,6 @@ start_agent (void)
err = start_new_gpg_agent (&agent_ctx, err = start_new_gpg_agent (&agent_ctx,
agentargs.errsource, agentargs.errsource,
agentargs.homedir,
agentargs.agent_program, agentargs.agent_program,
agentargs.lc_ctype, agentargs.lc_ctype,
agentargs.lc_messages, agentargs.lc_messages,

1
common/get-passphrase.h
View File

@ -34,7 +34,6 @@
void gnupg_prepare_get_passphrase (gpg_err_source_t errsource, void gnupg_prepare_get_passphrase (gpg_err_source_t errsource,
int verbosity, int verbosity,
const char *homedir,
const char *agent_program, const char *agent_program,
const char *opt_lc_ctype, const char *opt_lc_ctype,
const char *opt_lc_messages, const char *opt_lc_messages,

1
dirmngr/dirmngr-client.c
View File

@ -298,7 +298,6 @@ main (int argc, char **argv )
err = start_new_dirmngr (&ctx, err = start_new_dirmngr (&ctx,
GPG_ERR_SOURCE_DEFAULT, GPG_ERR_SOURCE_DEFAULT,
default_homedir (),
opt.dirmngr_program opt.dirmngr_program
? opt.dirmngr_program ? opt.dirmngr_program
: gnupg_module_name (GNUPG_MODULE_NAME_DIRMNGR), : gnupg_module_name (GNUPG_MODULE_NAME_DIRMNGR),

1
g10/call-agent.c
View File

@ -303,7 +303,6 @@ start_agent (ctrl_t ctrl, int for_card)
{ {
rc = start_new_gpg_agent (&agent_ctx, rc = start_new_gpg_agent (&agent_ctx,
GPG_ERR_SOURCE_DEFAULT, GPG_ERR_SOURCE_DEFAULT,
gnupg_homedir (),
opt.agent_program, opt.agent_program,
opt.lc_ctype, opt.lc_messages, opt.lc_ctype, opt.lc_messages,
opt.session_env, opt.session_env,

1
g10/call-dirmngr.c
View File

@ -177,7 +177,6 @@ create_context (ctrl_t ctrl, assuan_context_t *r_ctx)
*r_ctx = NULL; *r_ctx = NULL;
err = start_new_dirmngr (&ctx, err = start_new_dirmngr (&ctx,
GPG_ERR_SOURCE_DEFAULT, GPG_ERR_SOURCE_DEFAULT,
gnupg_homedir (),
opt.dirmngr_program, opt.dirmngr_program,
opt.autostart, opt.verbose, DBG_IPC, opt.autostart, opt.verbose, DBG_IPC,
NULL /*gpg_status2*/, ctrl); NULL /*gpg_status2*/, ctrl);

1
sm/call-agent.c
View File

@ -133,7 +133,6 @@ start_agent (ctrl_t ctrl)
{ {
rc = start_new_gpg_agent (&agent_ctx, rc = start_new_gpg_agent (&agent_ctx,
GPG_ERR_SOURCE_DEFAULT, GPG_ERR_SOURCE_DEFAULT,
gnupg_homedir (),
opt.agent_program, opt.agent_program,
opt.lc_ctype, opt.lc_messages, opt.lc_ctype, opt.lc_messages,
opt.session_env, opt.session_env,

2
sm/call-dirmngr.c
View File

@ -248,7 +248,7 @@ start_dirmngr_ext (ctrl_t ctrl, assuan_context_t *ctx_r)
to take care of the implicit option sending caching. */ to take care of the implicit option sending caching. */
err = start_new_dirmngr (&ctx, GPG_ERR_SOURCE_DEFAULT, err = start_new_dirmngr (&ctx, GPG_ERR_SOURCE_DEFAULT,
gnupg_homedir (), opt.dirmngr_program, opt.dirmngr_program,
opt.autostart, opt.verbose, DBG_IPC, opt.autostart, opt.verbose, DBG_IPC,
gpgsm_status2, ctrl); gpgsm_status2, ctrl);
if (!opt.autostart && gpg_err_code (err) == GPG_ERR_NO_DIRMNGR) if (!opt.autostart && gpg_err_code (err) == GPG_ERR_NO_DIRMNGR)

2
tools/gpg-connect-agent.c
View File

@ -2208,7 +2208,6 @@ start_agent (void)
if (opt.use_dirmngr) if (opt.use_dirmngr)
err = start_new_dirmngr (&ctx, err = start_new_dirmngr (&ctx,
GPG_ERR_SOURCE_DEFAULT, GPG_ERR_SOURCE_DEFAULT,
gnupg_homedir (),
opt.dirmngr_program, opt.dirmngr_program,
opt.autostart, opt.autostart,
!opt.quiet, 0, !opt.quiet, 0,
@ -2216,7 +2215,6 @@ start_agent (void)
else else
err = start_new_gpg_agent (&ctx, err = start_new_gpg_agent (&ctx,
GPG_ERR_SOURCE_DEFAULT, GPG_ERR_SOURCE_DEFAULT,
gnupg_homedir (),
opt.agent_program, opt.agent_program,
NULL, NULL, NULL, NULL,
session_env, session_env,