1
0
mirror of git://git.gnupg.org/gnupg.git synced 2024-11-04 20:38:50 +01:00

Fixed delkey

This commit is contained in:
Werner Koch 2001-01-29 17:46:16 +00:00
parent cae57d39d7
commit a910f4f50c
3 changed files with 8 additions and 1 deletions

View File

@ -1,3 +1,9 @@
2001-01-29 Werner Koch <wk@gnupg.org>
* g10.c (main): --batch dioes now set nogreeting.
* delkey.c (do_delete_key): Fixed delete-both functionality.
2001-01-22 Werner Koch <wk@gnupg.org>
* g10.c: New command --delete-secret-and-public-key.

View File

@ -95,6 +95,7 @@ do_delete_key( const char *username, int secret, int *r_sec_avail )
if( !rc ) {
*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) );

View File

@ -803,7 +803,7 @@ main( int argc, char **argv )
opt.verbose++; opt.list_sigs=1; break;
case oKOption: set_cmd( &cmd, aKMode ); break;
case oBatch: opt.batch = 1; greeting = 0; break;
case oBatch: opt.batch = 1; nogreeting = 1; break;
case oUseAgent: opt.use_agent = 1; break;
case oAnswerYes: opt.answer_yes = 1; break;
case oAnswerNo: opt.answer_no = 1; break;