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 9bafcc8950258932830d1ed436e01711f56650a1..56394a5527de29890817d2b603602ef55e31a372 100644 (file)
--- a/lookup.c
+++ b/lookup.c
@@ -164,20 +164,18 @@ int main(int argc, char *argv[])
                switch (op) {
                case OP_GET:
                        if (ishex) {
                switch (op) {
                case OP_GET:
                        if (ishex) {

-                               logthing(LOGTHING_NOTICE, 
-                                       "Getting keyid 0x%" PRIX64,
-                                       keyid);

                                result = config.dbbackend->fetch_key(keyid,
                                        &publickey, false);
                        } else {
                                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) {
                                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,
                                puts("<pre>");
                                cleankeys(publickey);
                                flatten_publickey(publickey,


@@ -189,7 +187,8 @@ int main(int argc, char *argv[])
                                puts("</pre>");
                        } else {
                                logthing(LOGTHING_NOTICE,
                                puts("</pre>");
                        } else {
                                logthing(LOGTHING_NOTICE,

-                                       "Failed to fetch key.");
+                                       "Failed to find key for search %s",
+                                       search);

                                puts("Key not found");
                        }
                        break;
                                puts("Key not found");
                        }
                        break;