diff options
| author | NIIBE Yutaka <[email protected]> | 2018-07-12 08:09:14 +0000 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2018-07-12 08:09:14 +0000 |
| commit | e8caa282d3d5f286919a1ed3db6699c555b7e89d (patch) | |
| tree | 1762014bacef69c542923f55dfe83a2f925d7999 /agent/gpg-agent.c | |
| parent | g10: Fix enum_secret_keys for card keys. (diff) | |
| parent | gpg: Remove multiple subkey bindings during export-clean. (diff) | |
| download | gnupg-gniibe/decryption-key.tar.gz gnupg-gniibe/decryption-key.zip | |
Merge branch 'master' into gniibe/decryption-keygniibe/decryption-key
Diffstat (limited to 'agent/gpg-agent.c')
| -rw-r--r-- | agent/gpg-agent.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c index bd9a471e8..1fdc94d0f 100644 --- a/agent/gpg-agent.c +++ b/agent/gpg-agent.c @@ -1979,15 +1979,15 @@ agent_deinit_default_ctrl (ctrl_t ctrl) gpg_error_t 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; - int idx; - const char *value; + int iterator = 0; + const char *name, *value; - for (idx=0; !err && names[idx]; idx++) - if ((value = session_env_getenv (opt.startup_env, names[idx]))) - err = session_env_setenv (ctrl->session_env, names[idx], value); + while (!err && (name = session_env_list_stdenvnames (&iterator, NULL))) + { + 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 (!(ctrl->lc_ctype = xtrystrdup (opt.startup_lc_ctype))) |