diff options
| author | Werner Koch <[email protected]> | 2004-02-21 13:05:22 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2004-02-21 13:05:22 +0000 |
| commit | a425334f4884a6cd5f95976cf1d0950305f40691 (patch) | |
| tree | c5eefffb95391be28015dc8a8a477797911e6ccb /agent/command.c | |
| parent | Fixed URLs in the notice messages. (diff) | |
| download | gnupg-a425334f4884a6cd5f95976cf1d0950305f40691.tar.gz gnupg-a425334f4884a6cd5f95976cf1d0950305f40691.zip | |
* command.c (cmd_passwd): Take acount of a key description.
* genkey.c (reenter_compare_cb): Do not set the error text.
(agent_protect_and_store, agent_genkey): Force a re-enter after a
non-matching passphrase.
* query.c (agent_askpin): Add new arg INITIAL_ERRTEXT; changed
all callers.
Diffstat (limited to 'agent/command.c')
| -rw-r--r-- | agent/command.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/agent/command.c b/agent/command.c index 2fa182f63..1d1ae9704 100644 --- a/agent/command.c +++ b/agent/command.c @@ -664,7 +664,8 @@ cmd_passwd (ASSUAN_CONTEXT ctx, char *line) return rc; /* we can't jump to leave because this is already an Assuan error code. */ - rc = agent_key_from_file (ctrl, NULL, grip, &shadow_info, 1, &s_skey); + rc = agent_key_from_file (ctrl, ctrl->server_local->keydesc, + grip, &shadow_info, 1, &s_skey); if (rc) ; else if (!s_skey) @@ -675,6 +676,8 @@ cmd_passwd (ASSUAN_CONTEXT ctx, char *line) else rc = agent_protect_and_store (ctrl, s_skey); + xfree (ctrl->server_local->keydesc); + ctrl->server_local->keydesc = NULL; gcry_sexp_release (s_skey); xfree (shadow_info); if (rc) |