diff options
| author | Werner Koch <wk@gnupg.org> | 2009-07-07 12:02:41 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2009-07-07 12:02:41 +0200 |
| commit | f6f5430e5014f90b685420447dffe89b220e2663 (patch) | |
| tree | 0a8c28fc24f291bbc3a148f7240d1c49421f9077 /tools | |
| parent | * debugging.texi (Common Problems): Add a note about corrupted (diff) | |
| download | gnupg2-f6f5430e5014f90b685420447dffe89b220e2663.tar.xz gnupg2-f6f5430e5014f90b685420447dffe89b220e2663.zip | |
Reworked passing of envars to Pinentry.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/ChangeLog | 8 | ||||
| -rw-r--r-- | tools/gpg-connect-agent.c | 8 |
2 files changed, 14 insertions, 2 deletions
diff --git a/tools/ChangeLog b/tools/ChangeLog index 5f716e320..fceb649f9 100644 --- a/tools/ChangeLog +++ b/tools/ChangeLog @@ -1,3 +1,8 @@ +2009-07-07 Werner Koch <wk@g10code.com> + + * gpg-connect-agent.c (start_agent): Adjust for changed args of + send_pinentry_environment. + 2009-06-30 Werner Koch <wk@g10code.com> * ccidmon.c (parse_line_sniffusb): Take also TAB as delimiter. @@ -1022,7 +1027,8 @@ * watchgnupg.c: New. - Copyright 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + Copyright 2003, 2004, 2005, 2006, 2007, 2008, + 2009 Free Software Foundation, Inc. This file is free software; as a special exception the author gives unlimited permission to copy and/or distribute it, with or without diff --git a/tools/gpg-connect-agent.c b/tools/gpg-connect-agent.c index 06dafd5c9..90f54a44d 100644 --- a/tools/gpg-connect-agent.c +++ b/tools/gpg-connect-agent.c @@ -2079,6 +2079,12 @@ start_agent (void) int rc = 0; char *infostr, *p; assuan_context_t ctx; + session_env_t session_env; + + session_env = session_env_new (); + if (!session_env) + log_fatal ("error allocating session environment block: %s\n", + strerror (errno)); infostr = getenv ("GPG_AGENT_INFO"); if (!infostr || !*infostr) @@ -2169,7 +2175,7 @@ start_agent (void) } rc = send_pinentry_environment (ctx, GPG_ERR_SOURCE_DEFAULT, - NULL, NULL, NULL, NULL, NULL, NULL, NULL); + NULL, NULL, session_env); if (rc) { log_error (_("error sending standard options: %s\n"), gpg_strerror (rc)); |