diff options
| author | Werner Koch <[email protected]> | 2010-04-21 16:26:17 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2010-04-21 16:26:17 +0000 |
| commit | a1412b05debe693e6aabaf2c2c337bc33f7dfd41 (patch) | |
| tree | 214dc8928b73aaa385d69eaa180164318ff0bb93 /g10/delkey.c | |
| parent | Disable card support for now (diff) | |
| download | gnupg-a1412b05debe693e6aabaf2c2c337bc33f7dfd41.tar.gz gnupg-a1412b05debe693e6aabaf2c2c337bc33f7dfd41.zip | |
More changes on the way to remove secring.gpg.
Diffstat (limited to 'g10/delkey.c')
| -rw-r--r-- | g10/delkey.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/g10/delkey.c b/g10/delkey.c index 5d86e7291..2361d8323 100644 --- a/g10/delkey.c +++ b/g10/delkey.c @@ -52,7 +52,7 @@ do_delete_key( const char *username, int secret, int force, int *r_sec_avail ) int rc = 0; KBNODE keyblock = NULL; KBNODE node; - KEYDB_HANDLE hd = keydb_new (secret); + KEYDB_HANDLE hd = keydb_new (); PKT_public_key *pk = NULL; PKT_secret_key *sk = NULL; u32 keyid[2]; @@ -104,15 +104,12 @@ do_delete_key( const char *username, int secret, int force, int *r_sec_avail ) if(!force) { - rc = seckey_available( keyid ); - if( !rc ) + if (have_secret_key_with_kid (keyid)) { *r_sec_avail = 1; rc = -1; goto leave; } - else if( rc != G10ERR_NO_SECKEY ) - log_error("%s: get secret key: %s\n", username, g10_errstr(rc) ); else rc = 0; } |