aboutsummaryrefslogtreecommitdiffstats
path: root/common/session-env.c
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2014-12-19 12:07:09 +0000
committerWerner Koch <[email protected]>2014-12-19 12:07:09 +0000
commit14601eacb51f6c8a60d3d57aee1be11debd94c68 (patch)
tree7c483a13e8cc474f21ef90f6d3c86220887c6fe8 /common/session-env.c
parentagent: Fix string prepended to remotely initiated prompts. (diff)
downloadgnupg-14601eacb51f6c8a60d3d57aee1be11debd94c68.tar.gz
gnupg-14601eacb51f6c8a60d3d57aee1be11debd94c68.zip
agent: Keep the session environment for restricted connections.
* agent/command-ssh.c (setup_ssh_env): Move code to ... * agent/gpg-agent.c (agent_copy_startup_env): .. new function. Change calllers. * agent/command.c (start_command_handler): Call that fucntion for restricted connections. -- A remote connection is and should not be able to setup the local session environment. However, unless --keep-display is used we would be left without an environment and thus pinentry can't be used. The fix is the same as used for ssh-agent connection: We use the default environment as used at the startup of the agent. Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'common/session-env.c')
-rw-r--r--common/session-env.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/common/session-env.c b/common/session-env.c
index 478d5e3be..8f78c10cb 100644
--- a/common/session-env.c
+++ b/common/session-env.c
@@ -56,7 +56,7 @@ struct session_environment_s
};
-/* A list of environment vribales we pass from the acual user
+/* A list of environment vribales we pass from the actual user
(e.g. gpgme) down to the pinentry. We do not handle the locale
settings because they do not only depend on envvars. */
static struct