aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--gpgme/ChangeLog2
-rw-r--r--gpgme/rungpg.c9
2 files changed, 10 insertions, 1 deletions
diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog
index 5c68e9c9..d9752eb4 100644
--- a/gpgme/ChangeLog
+++ b/gpgme/ChangeLog
@@ -1,5 +1,7 @@
2002-06-20 Werner Koch <[email protected]>
+ * rungpg.c (build_argv): Ignore GPG_AGENT_INFO if set but empty.
+
* verify.c (calc_sig_summary): Set bad policy for wrong key usage.
(skip_token): New.
(_gpgme_verify_status_handler): Watch out for wrong key usage.
diff --git a/gpgme/rungpg.c b/gpgme/rungpg.c
index df84ee5d..dcc96bfd 100644
--- a/gpgme/rungpg.c
+++ b/gpgme/rungpg.c
@@ -577,7 +577,14 @@ build_argv (GpgObject gpg)
size_t datac=0, argc=0;
char **argv;
int need_special = 0;
- int use_agent = !!getenv ("GPG_AGENT_INFO");
+ int use_agent = 0;
+ char *p;
+
+ /* We don't want to use the agent with a malformed environment
+ variable. This is only a very basic test but sufficient to make
+ our life in the regression tests easier. */
+ p = getenv ("GPG_AGENT_INFO");
+ use_agent = (p && strchr (p, ':'));
if (gpg->argv)
{