From: Jonathan McDowell <noodles@meepok>
Date: Thu, 24 Apr 2008 20:12:09 +0000 (+0100)
Subject: Allow the use of search text for gets, rather than just keyids
X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/commitdiff_plain/c7102948c58ec797995297699bac64748d168bfd?ds=sidebyside;hp=584b44f3613a29ce27fc8b87cdd8654d3357ed4f

Allow the use of search text for gets, rather than just keyids

  Apparently PGP Desktop sends a get with search text rather than a
  specific key id, so add support for that. Reported by Timothy Legge.
---

diff --git a/lookup.c b/lookup.c
index d48bc3f..3431690 100644
--- a/lookup.c
+++ b/lookup.c
@@ -87,6 +87,7 @@ int main(int argc, char *argv[])
 	struct openpgp_publickey *publickey = NULL;
 	struct openpgp_packet_list *packets = NULL;
 	struct openpgp_packet_list *list_end = NULL;
+	int result;
 
 	params = getcgivars(argc, argv);
 	for (i = 0; params != NULL && params[i] != NULL; i += 2) {
@@ -162,10 +163,21 @@ int main(int argc, char *argv[])
 		config.dbbackend->initdb(true);
 		switch (op) {
 		case OP_GET:
-			logthing(LOGTHING_NOTICE, "Getting keyid 0x%llX",
+			if (ishex) {
+				logthing(LOGTHING_NOTICE, 
+					"Getting keyid 0x%llX",
 					keyid);
-			if (config.dbbackend->fetch_key(keyid, &publickey,
-					false)) {
+				result = config.dbbackend->fetch_key(keyid,
+					&publickey, false);
+			} else {
+				logthing(LOGTHING_NOTICE, 
+					"Getting key(s) for search text %s",
+					search);
+				result = config.dbbackend->fetch_key_text(
+					search,
+					&publickey);
+			}
+			if (result) {
 				puts("<pre>");
 				cleankeys(publickey);
 				flatten_publickey(publickey,