X-Git-Url: http://the.earth.li/gitweb/?a=blobdiff_plain;f=onak.c;h=384b6749f61c372c0d0077f6d8fa5602fff2f247;hb=5cb163e87c7f0717aa94ca281a56e572c2a6c8f3;hp=b7cfc80205a55e89184f738f12332267f2701f41;hpb=fd9ca85878543771a7f09afd821a5a5511e71aea;p=onak.git

diff --git a/onak.c b/onak.c
index b7cfc80..384b674 100644
--- a/onak.c
+++ b/onak.c
@@ -387,9 +387,16 @@ 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,
+							true)) {
+					get_fingerprint(keys->publickey,
+							&fingerprint);
+					dbctx->delete_key(dbctx, &fingerprint,
+							true);
+				}
+			} 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 +455,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 {