aboutsummaryrefslogtreecommitdiffstats
path: root/agent/agent.h
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 /agent/agent.h
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 'agent/agent.h')
-rw-r--r--agent/agent.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/agent/agent.h b/agent/agent.h
index a1663cd56..c7c65afa7 100644
--- a/agent/agent.h
+++ b/agent/agent.h
@@ -278,6 +278,7 @@ typedef int (*lookup_ttl_t)(const char *hexgrip);
/*-- gpg-agent.c --*/
void agent_exit (int rc) JNLIB_GCC_A_NR; /* Also implemented in other tools */
+gpg_error_t agent_copy_startup_env (ctrl_t ctrl);
const char *get_agent_socket_name (void);
const char *get_agent_ssh_socket_name (void);
#ifdef HAVE_W32_SYSTEM