From: Jonathan McDowell <noodles@earth.li>
Date: Sat, 16 Apr 2011 20:28:33 +0000 (-0700)
Subject: Output details of key search after retrieval for pks/lookup
X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/commitdiff_plain/993c6aedfc6c3f953fceaa6a023151a9ccbc57c4?ds=sidebyside

Output details of key search after retrieval for pks/lookup

  Rather than logging what we're searching for beforehand, and then
  indicating failure after (but not success), just output the results
  and search details after retrieval.
---

diff --git a/lookup.c b/lookup.c
index 9bafcc8..56394a5 100644
--- a/lookup.c
+++ b/lookup.c
@@ -164,20 +164,18 @@ int main(int argc, char *argv[])
 		switch (op) {
 		case OP_GET:
 			if (ishex) {
-				logthing(LOGTHING_NOTICE, 
-					"Getting keyid 0x%" PRIX64,
-					keyid);
 				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) {
+				logthing(LOGTHING_NOTICE, 
+					"Found %d key(s) for search %s",
+					result,
+					search);
 				puts("<pre>");
 				cleankeys(publickey);
 				flatten_publickey(publickey,
@@ -189,7 +187,8 @@ int main(int argc, char *argv[])
 				puts("</pre>");
 			} else {
 				logthing(LOGTHING_NOTICE,
-					"Failed to fetch key.");
+					"Failed to find key for search %s",
+					search);
 				puts("Key not found");
 			}
 			break;