diff options
Diffstat (limited to 'g10/delkey.c')
| -rw-r--r-- | g10/delkey.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/g10/delkey.c b/g10/delkey.c index 8d4f1a5b0..31d7caaa4 100644 --- a/g10/delkey.c +++ b/g10/delkey.c @@ -1,5 +1,5 @@ /* delkey.c - delete keys - * Copyright (C) 1998 Free Software Foundation, Inc. + * Copyright (C) 1998, 1999 Free Software Foundation, Inc. * * This file is part of GnuPG. * @@ -62,6 +62,7 @@ delete_key( const char *username, int secret ) : find_keyblock_byname( &kbpos, username ); if( rc ) { log_error(_("%s: user not found\n"), username ); + write_status_text( STATUS_DELETE_PROBLEM, "1" ); goto leave; } @@ -93,10 +94,12 @@ delete_key( const char *username, int secret ) "there is a secret key for this public key!\n")); log_info(_( "use option \"--delete-secret-key\" to delete it first.\n")); + write_status_text( STATUS_DELETE_PROBLEM, "2" ); rc = -1; } - else if( rc != G10ERR_NO_SECKEY ) + else if( rc != G10ERR_NO_SECKEY ) { log_error("%s: get secret key: %s\n", username, g10_errstr(rc) ); + } else rc = 0; } @@ -124,7 +127,7 @@ delete_key( const char *username, int secret ) pubkey_letter( pk->pubkey_algo ), keyid[1], datestr_from_pk(pk) ); p = get_user_id( keyid, &n ); - tty_print_string( p, n ); + tty_print_utf8_string( p, n ); m_free(p); tty_printf("\n\n"); |