dbctx = config.dbinit(config.backend, false);
logthing(LOGTHING_NOTICE, "Got %d new keys.",
dbctx->update_keys(dbctx, &keys,
- false));
+ &config.blacklist,
+ false));
if (keys != NULL && update) {
flatten_publickey(keys,
&packets,
puts("Key not found");
}
} else if (!strcmp("delete", argv[optind])) {
- dbctx->delete_key(dbctx,
- dbctx->getfullkeyid(dbctx, keyid),
- false);
+ if (!isfp) {
+ if (dbctx->fetch_key_id(dbctx, keyid, &keys,
+ false)) {
+ get_fingerprint(keys->publickey,
+ &fingerprint);
+ dbctx->delete_key(dbctx, &fingerprint,
+ false);
+ free_publickey(keys);
+ keys = NULL;
+ }
+ } else
+ dbctx->delete_key(dbctx, &fingerprint, false);
} else if (!strcmp("get", argv[optind])) {
if (!(ishex || isfp)) {
puts("Can't get a key on uid text."
} else if (!strcmp("reindex", argv[optind])) {
dbctx->starttrans(dbctx);
if (dbctx->fetch_key_id(dbctx, keyid, &keys, true)) {
- dbctx->delete_key(dbctx, keyid, true);
+ get_fingerprint(keys->publickey, &fingerprint);
+ dbctx->delete_key(dbctx, &fingerprint, true);
cleankeys(&keys, config.clean_policies);
dbctx->store_key(dbctx, keys, true, false);
} else {