X-Git-Url: https://the.earth.li/gitweb/?a=blobdiff_plain;f=onak.c;h=70f54348ccf39b5fa733b37425f523ef0ba04b72;hb=3886942162fd8193d8a804a685a3f96a65b9712c;hp=b7cfc80205a55e89184f738f12332267f2701f41;hpb=85187675424f3854869f1607afd8a1e84e536946;p=onak.git

diff --git a/onak.c b/onak.c
index b7cfc80..70f5434 100644
--- a/onak.c
+++ b/onak.c
@@ -241,7 +241,8 @@ int main(int argc, char *argv[])
 			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,
@@ -387,9 +388,18 @@ int main(int argc, char *argv[])
 				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."
@@ -448,7 +458,8 @@ int main(int argc, char *argv[])
 		} 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 {