security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-22 10:19:57 +01:00
Code Activity

agent: Add DBUS_SESSION_BUS_ADDRESS et al. to the startup list.

Browse Source 
* agent/gpg-agent.c (agent_copy_startup_env): Replace explicit list
with the standard list.
--

Although the function agent_copy_startup_env is newer than
session_env_list_stdenvnames the latter was not used.  When
DBUS_SESSION_BUS_ADDRESS was added to the latter it was forgotten to
add it to the former as well.  Having all stdnames here seems to be
the Right Thing (tm) to do.

GnuPG-bug-id: 3947
Signed-off-by: Werner Koch <wk@gnupg.org>
(cherry picked from commit 7ffc1ac7dd95d4cc1897a4c36d5cd628741c12f2)
This commit is contained in:
Werner Koch 2018-06-06 18:28:44 +02:00
parent 8c0e1fac96
commit c5c8fb1ec7
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
agent/gpg-agent.c
View File

@ -1979,15 +1979,15 @@ agent_deinit_default_ctrl (ctrl_t ctrl)
gpg_error_t gpg_error_t
agent_copy_startup_env (ctrl_t ctrl) agent_copy_startup_env (ctrl_t ctrl)
{ {
static const char *names[] =
{"GPG_TTY", "DISPLAY", "TERM", "XAUTHORITY", "PINENTRY_USER_DATA", NULL};
gpg_error_t err = 0; gpg_error_t err = 0;
int idx; int iterator = 0;
const char *value; const char *name, *value;
for (idx=0; !err && names[idx]; idx++) while (!err && (name = session_env_list_stdenvnames (&iterator, NULL)))
if ((value = session_env_getenv (opt.startup_env, names[idx]))) {
err = session_env_setenv (ctrl->session_env, names[idx], value); if ((value = session_env_getenv (opt.startup_env, name)))
err = session_env_setenv (ctrl->session_env, name, value);
}
if (!err && !ctrl->lc_ctype && opt.startup_lc_ctype) if (!err && !ctrl->lc_ctype && opt.startup_lc_ctype)
if (!(ctrl->lc_ctype = xtrystrdup (opt.startup_lc_ctype))) if (!(ctrl->lc_ctype = xtrystrdup (opt.startup_lc_ctype)))