security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-02-03 16:53:03 +01:00
Code Activity

* delkey.c (do_delete_key): Always allow to delete a key in batch mode

Browse Source 
when specified by fingerprint.  Suggested by Enzo Michelangeli.
This commit is contained in:
Werner Koch 2002-08-02 10:15:39 +00:00
parent 3b2ac8a2d8
commit 4493a9603b
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
g10/ChangeLog
View File

@ -13,6 +13,11 @@
* sig-check.c (do_check): Properly validate v4 sigs with no hashed * sig-check.c (do_check): Properly validate v4 sigs with no hashed
section at all. section at all.
2002-07-25 Werner Koch <wk@gnupg.org>
* delkey.c (do_delete_key): Always allow to delete a key in batch mode
when specified by fingerprint. Suggested by Enzo Michelangeli.
2002-07-25 David Shaw <dshaw@jabberwocky.com> 2002-07-25 David Shaw <dshaw@jabberwocky.com>
* keyedit.c (menu_revsig): Change "revsig" to honor selected uids * keyedit.c (menu_revsig): Change "revsig" to honor selected uids
@ -25,6 +30,7 @@
* exec.c, export.c, import.c, keyedit.c, keyserver.c, misc.c: * exec.c, export.c, import.c, keyedit.c, keyserver.c, misc.c:
"Warning" -> "WARNING" "Warning" -> "WARNING"
>>>>>>> 1.214
2002-07-24 David Shaw <dshaw@jabberwocky.com> 2002-07-24 David Shaw <dshaw@jabberwocky.com>
* main.h, import.c (parse_import_options, fix_hkp_corruption, * main.h, import.c (parse_import_options, fix_hkp_corruption,

12
g10/delkey.c
View File

@ -59,11 +59,15 @@ do_delete_key( const char *username, int secret, int *r_sec_avail )
int okay=0; int okay=0;
int yes; int yes;
KEYDB_SEARCH_DESC desc; KEYDB_SEARCH_DESC desc;
int exactmatch;
*r_sec_avail = 0; *r_sec_avail = 0;
/* search the userid */ /* search the userid */
classify_user_id (username, &desc); classify_user_id (username, &desc);
exactmatch = (desc.mode == KEYDB_SEARCH_MODE_FPR
|| desc.mode == KEYDB_SEARCH_MODE_FPR16
|| desc.mode == KEYDB_SEARCH_MODE_FPR20);
rc = desc.mode? keydb_search (hd, &desc, 1):G10ERR_INV_USER_ID; rc = desc.mode? keydb_search (hd, &desc, 1):G10ERR_INV_USER_ID;
if (rc) { if (rc) {
log_error (_("key `%s' not found: %s\n"), username, g10_errstr (rc)); log_error (_("key `%s' not found: %s\n"), username, g10_errstr (rc));
@ -108,12 +112,20 @@ do_delete_key( const char *username, int secret, int *r_sec_avail )
if( rc ) if( rc )
rc = 0; rc = 0;
else if (opt.batch && exactmatch)
okay++;
else if( opt.batch && secret ) else if( opt.batch && secret )
{
log_error(_("can't do that in batchmode\n")); log_error(_("can't do that in batchmode\n"));
log_info (_("(unless you specify the key by fingerprint)\n"));
}
else if( opt.batch && opt.answer_yes ) else if( opt.batch && opt.answer_yes )
okay++; okay++;
else if( opt.batch ) else if( opt.batch )
{
log_error(_("can't do that in batchmode without \"--yes\"\n")); log_error(_("can't do that in batchmode without \"--yes\"\n"));
log_info (_("(unless you specify the key by fingerprint)\n"));
}
else { else {
char *p; char *p;
size_t n; size_t n;