diff options
| author | Werner Koch <[email protected]> | 2011-03-02 08:11:40 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2011-03-02 08:11:40 +0000 |
| commit | 528d77a0ccad4e54480ea4f069b4bbc28779b3ce (patch) | |
| tree | 910b68c045e57ef3ef1d7a8d7150132aa84522f8 | |
| parent | Added CLEAR_PASSPHRASE option --agent to search the cache for a cacheid with ... (diff) | |
| download | gnupg-528d77a0ccad4e54480ea4f069b4bbc28779b3ce.tar.gz gnupg-528d77a0ccad4e54480ea4f069b4bbc28779b3ce.zip | |
Rename Ben's new option.
Diffstat (limited to '')
| -rw-r--r-- | agent/ChangeLog | 4 | ||||
| -rw-r--r-- | agent/command.c | 14 |
2 files changed, 11 insertions, 7 deletions
diff --git a/agent/ChangeLog b/agent/ChangeLog index 0390275fc..f8156bc37 100644 --- a/agent/ChangeLog +++ b/agent/ChangeLog @@ -1,3 +1,7 @@ +2011-03-02 Ben Kibbey <[email protected]> (wk) + + * command.c (cmd_clear_passphrase): Add option --mode=normal. + 2011-02-07 Werner Koch <[email protected]> * pksign.c (do_encode_dsa): Enforce multipe of 8 bits only for DSA. diff --git a/agent/command.c b/agent/command.c index 63f59d408..9533db7c0 100644 --- a/agent/command.c +++ b/agent/command.c @@ -1267,20 +1267,20 @@ cmd_get_passphrase (assuan_context_t ctx, char *line) static const char hlp_clear_passphrase[] = - "CLEAR_PASSPHRASE [--agent] <cache_id>\n" + "CLEAR_PASSPHRASE [--mode=normal] <cache_id>\n" "\n" "may be used to invalidate the cache entry for a passphrase. The\n" "function returns with OK even when there is no cached passphrase.\n" - "The --agent option is used to clear an entry for a cacheid added by\n" - "the agent.\n"; + "The --mode=normal option is used to clear an entry for a cacheid\n" + "added by the agent.\n"; static gpg_error_t cmd_clear_passphrase (assuan_context_t ctx, char *line) { char *cacheid = NULL; char *p; - int opt_agent; + int opt_normal; - opt_agent = has_option (line, "--agent"); + opt_normal = has_option (line, "--mode=normal"); line = skip_options (line); /* parse the stuff */ @@ -1293,8 +1293,8 @@ cmd_clear_passphrase (assuan_context_t ctx, char *line) if (!cacheid || !*cacheid || strlen (cacheid) > 50) return set_error (GPG_ERR_ASS_PARAMETER, "invalid length of cacheID"); - agent_put_cache (cacheid, opt_agent ? CACHE_MODE_NORMAL : CACHE_MODE_USER, - NULL, 0); + agent_put_cache (cacheid, opt_normal ? CACHE_MODE_NORMAL : CACHE_MODE_USER, + NULL, 0); return 0; } |