diff options
| author | Werner Koch <[email protected]> | 2001-01-29 17:46:16 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2001-01-29 17:46:16 +0000 |
| commit | a910f4f50cbd33bf5170938b8af45cdcb498aebf (patch) | |
| tree | 3c8f9d2866df124de94cea53833c80c87aa44dda | |
| parent | docs extended, secure mem on Win32 updated (diff) | |
| download | gnupg-a910f4f50cbd33bf5170938b8af45cdcb498aebf.tar.gz gnupg-a910f4f50cbd33bf5170938b8af45cdcb498aebf.zip | |
Fixed delkey
| -rw-r--r-- | g10/ChangeLog | 6 | ||||
| -rw-r--r-- | g10/delkey.c | 1 | ||||
| -rw-r--r-- | g10/g10.c | 2 |
3 files changed, 8 insertions, 1 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index a92083747..386c916f9 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,9 @@ +2001-01-29 Werner Koch <[email protected]> + + * g10.c (main): --batch dioes now set nogreeting. + + * delkey.c (do_delete_key): Fixed delete-both functionality. + 2001-01-22 Werner Koch <[email protected]> * g10.c: New command --delete-secret-and-public-key. diff --git a/g10/delkey.c b/g10/delkey.c index a5560473e..a19e58067 100644 --- a/g10/delkey.c +++ b/g10/delkey.c @@ -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) ); @@ -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; |