diff options
| author | Ben Kibbey <[email protected]> | 2011-04-17 20:48:44 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2011-04-18 08:20:36 +0000 |
| commit | b5f585f7d796313cf7ae3d3fd35ed462a1f3d574 (patch) | |
| tree | 1bd503c264b48c65f9f30aa9a6debaca8d69635e | |
| parent | Fixed PASSWD --preset. (diff) | |
| download | gnupg-b5f585f7d796313cf7ae3d3fd35ed462a1f3d574.tar.gz gnupg-b5f585f7d796313cf7ae3d3fd35ed462a1f3d574.zip | |
Another PASSWD --preset fix.
Check for an error before presetting the passphrase.
Diffstat (limited to '')
| -rw-r--r-- | agent/ChangeLog | 4 | ||||
| -rw-r--r-- | agent/command.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/agent/ChangeLog b/agent/ChangeLog index cd781e257..e8570f7a4 100644 --- a/agent/ChangeLog +++ b/agent/ChangeLog @@ -1,3 +1,7 @@ +2011-04-17 Ben Kibbey <[email protected]> + + * command.c (cmd_passwd): Check for an error before presetting. + 2011-04-12 Ben Kibbey <[email protected]> * command.c (cmd_passwd): Fixed --preset when not previously cached. diff --git a/agent/command.c b/agent/command.c index d2ed23a67..9f45afbb0 100644 --- a/agent/command.c +++ b/agent/command.c @@ -1530,7 +1530,7 @@ cmd_passwd (assuan_context_t ctx, char *line) } } } - if (opt_preset) + if (!err && opt_preset) { char hexgrip[40+1]; bin2hex(grip, 20, hexgrip); |