security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-03 22:56:33 +02:00
Code Activity

Move idea_cipher_warn to misc.c so gpgv.c doesn't need a stub

Browse source 
Remove get_temp_dir (it's in exec.c now)
Allow --delete-key (now --delete-keys, though --delete-key still works) to
delete multiple keys in one go.  This applies to
--delete-secret-key(s) and --delete-secret-and-public-key(s) as well
This commit is contained in:
David Shaw 2002-01-09 19:59:26 +00:00
parent 0bd41cc2e5
commit bd5517b9e2
6 changed files with 77 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

41
g10/delkey.c
View file

@ -168,24 +168,33 @@ do_delete_key( const char *username, int secret, int *r_sec_avail )
* Delete a public or secret key from a keyring.
*/
int
delete_key( const char *username, int secret, int allow_both )
delete_keys( STRLIST names, int secret, int allow_both )
{
int rc, avail;
rc = do_delete_key (username, secret, &avail );
if ( rc && avail ) {
if ( allow_both ) {
rc = do_delete_key (username, 1, &avail );
if ( !rc )
rc = do_delete_key (username, 0, &avail );
}
else {
log_error(_(
"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" );
}
for(;names;names=names->next) {
rc = do_delete_key (names->d, secret, &avail );
if ( rc && avail ) {
if ( allow_both ) {
rc = do_delete_key (names->d, 1, &avail );
if ( !rc )
rc = do_delete_key (names->d, 0, &avail );
}
else {
log_error(_(
"there is a secret key for public key \"%s\"!\n"),names->d);
log_info(_(
"use option \"--delete-secret-keys\" to delete it first.\n"));
write_status_text( STATUS_DELETE_PROBLEM, "2" );
return rc;
}
}
if(rc) {
log_error("%s: delete key failed: %s\n", names->d, g10_errstr(rc) );
return rc;
}
}
return rc;
return 0;
}