aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2003-04-10 08:51:29 +0000
committerWerner Koch <[email protected]>2003-04-10 08:51:29 +0000
commit5ee4951f28624160b522c4a2e3d71608f4898298 (patch)
treea60b07a497e6149124e73cadc1fae25046b9d57d
parent* passphrase.c (read_passphrase_from_fd): Do a dummy read if the (diff)
downloadgnupg-5ee4951f28624160b522c4a2e3d71608f4898298.tar.gz
gnupg-5ee4951f28624160b522c4a2e3d71608f4898298.zip
Return cancel flag also for the old agent protocol.
-rw-r--r--g10/passphrase.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/g10/passphrase.c b/g10/passphrase.c
index fc2414ca3..a736deba8 100644
--- a/g10/passphrase.c
+++ b/g10/passphrase.c
@@ -772,7 +772,11 @@ agent_get_passphrase ( u32 *keyid, int mode, const char *tryagain_text,
return pw;
}
else if ( reply == GPGA_PROT_CANCELED )
- log_info ( _("cancelled by user\n") );
+ {
+ log_info ( _("cancelled by user\n") );
+ if (canceled)
+ *canceled = 1;
+ }
else
log_error ( _("problem with the agent: agent returns 0x%lx\n"),
(ulong)reply );