aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2015-05-20 14:13:55 +0000
committerWerner Koch <[email protected]>2015-05-20 14:20:24 +0000
commit78e0a30fb19010b48efd752e1a73af20f93be533 (patch)
treed1820a1472f81e628d18ce388cc346141843b546
parentagent: Backport changes from 2.1 to support an external password manager. (diff)
downloadgnupg-78e0a30fb19010b48efd752e1a73af20f93be533.tar.gz
gnupg-78e0a30fb19010b48efd752e1a73af20f93be533.zip
agent: Cleanup caching code for command GET_PASSPHRASE.
* agent/command.c (cmd_get_passphrase): Read from the user cache. -- We used to read the passphrase with mode CACHE_MODE_NORMAL but we put it into the cache with CACHE_MODE_USER. However, agent_get_cache does not yet distinguish between them and thus this does not change anything. (backported from commit 23d2ef83cda644c6a83499f9327350d3371e8a17)
-rw-r--r--agent/command.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/agent/command.c b/agent/command.c
index 765f916b3..93932120d 100644
--- a/agent/command.c
+++ b/agent/command.c
@@ -1245,7 +1245,7 @@ cmd_get_passphrase (assuan_context_t ctx, char *line)
if (!strcmp (desc, "X"))
desc = NULL;
- pw = cacheid ? agent_get_cache (cacheid, CACHE_MODE_NORMAL, &cache_marker)
+ pw = cacheid ? agent_get_cache (cacheid, CACHE_MODE_USER, &cache_marker)
: NULL;
if (pw)
{