diff options
| author | Werner Koch <[email protected]> | 2014-04-15 14:40:48 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2014-04-15 15:03:54 +0000 |
| commit | e3a4ff89a0b106e678bf9d0a4d47917123071140 (patch) | |
| tree | 16ce4dca4a890a8d79a41c3a76d74a2ca4771221 /agent/command-ssh.c | |
| parent | scd: EdDSA support. (diff) | |
| download | gnupg-e3a4ff89a0b106e678bf9d0a4d47917123071140.tar.gz gnupg-e3a4ff89a0b106e678bf9d0a4d47917123071140.zip | |
agent: Add command DELETE_KEY.
* agent/command.c (cmd_delete_key): New.
* agent/findkey.c (modify_description): Add '%C' feature.
(remove_key_file): New.
(agent_delete_key): New.
* agent/command-ssh.c (search_control_file): Make arg R_DISABLE
optional.
* configure.ac: Require libgpg-error 1.13.
Diffstat (limited to 'agent/command-ssh.c')
| -rw-r--r-- | agent/command-ssh.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/agent/command-ssh.c b/agent/command-ssh.c index 364a8ccb4..a81468125 100644 --- a/agent/command-ssh.c +++ b/agent/command-ssh.c @@ -1031,7 +1031,8 @@ search_control_file (ssh_control_file_t cf, const char *hexgrip, assert (strlen (hexgrip) == 40 ); - *r_disabled = 0; + if (r_disabled) + *r_disabled = 0; if (r_ttl) *r_ttl = 0; if (r_confirm) @@ -1047,7 +1048,8 @@ search_control_file (ssh_control_file_t cf, const char *hexgrip, } if (!err) { - *r_disabled = cf->item.disabled; + if (r_disabled) + *r_disabled = cf->item.disabled; if (r_ttl) *r_ttl = cf->item.ttl; if (r_confirm) |