diff options
| author | Werner Koch <[email protected]> | 2000-10-06 12:28:44 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2000-10-06 12:28:44 +0000 |
| commit | 14974bc5d70604577b7088a39e7eb175cafd418a (patch) | |
| tree | ae5aa26daa1342b77a7ceb0f0295950dff3b3557 /g10/delkey.c | |
| parent | See ChangeLog: Wed Oct 4 13:16:18 CEST 2000 Werner Koch (diff) | |
| download | gnupg-14974bc5d70604577b7088a39e7eb175cafd418a.tar.gz gnupg-14974bc5d70604577b7088a39e7eb175cafd418a.zip | |
See ChangeLog: Fri Oct 6 14:29:16 CEST 2000 Werner Koch
Diffstat (limited to 'g10/delkey.c')
| -rw-r--r-- | g10/delkey.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/g10/delkey.c b/g10/delkey.c index 0c64d41a3..91413edd8 100644 --- a/g10/delkey.c +++ b/g10/delkey.c @@ -58,21 +58,14 @@ delete_key( const char *username, int secret ) int yes; /* search the userid */ - rc = secret? find_secret_keyblock_byname( &kbpos, username ) - : find_keyblock_byname( &kbpos, username ); + rc = secret? find_secret_keyblock_byname( &keyblock, username ) + : find_keyblock_byname( &keyblock, username ); if( rc ) { - log_error(_("%s: user not found\n"), username ); + log_error(_("%s: user not found: %s\n"), username, gpg_errstr(rc) ); write_status_text( STATUS_DELETE_PROBLEM, "1" ); goto leave; } - /* read the keyblock */ - rc = read_keyblock( &kbpos, &keyblock ); - if( rc ) { - log_error("%s: read problem: %s\n", username, gpg_errstr(rc) ); - goto leave; - } - /* get the keyid from the keyblock */ node = find_kbnode( keyblock, secret? PKT_SECRET_KEY:PKT_PUBLIC_KEY ); if( !node ) { |