X-Git-Url: https://the.earth.li/gitweb/?a=blobdiff_plain;f=lookup.c;h=e4cab46f2ad362030db60c9f5cde4274dfa4b513;hb=ad30ce51bf609c35cd99a9ca46dd859b17d8164a;hp=5d638eab6ef224100a691bff9f8c170ee9498be5;hpb=42d43e0ec08e249cecf74ec448cb6405b3c89d84;p=onak.git

diff --git a/lookup.c b/lookup.c
index 5d638ea..e4cab46 100644
--- a/lookup.c
+++ b/lookup.c
@@ -4,8 +4,6 @@
  * Jonathan McDowell <noodles@earth.li>
  *
  * Copyright 2002 Project Purple
- *
- * $Id: lookup.c,v 1.15 2004/05/27 01:25:37 noodles Exp $
  */
 
 #include <inttypes.h>
@@ -17,6 +15,8 @@
 
 #include "armor.h"
 #include "charfuncs.h"
+#include "cleankey.h"
+#include "cleanup.h"
 #include "getcgi.h"
 #include "keydb.h"
 #include "keyindex.h"
@@ -157,13 +157,15 @@ int main(int argc, char *argv[])
 	} else {
 		readconfig(NULL);
 		initlogthing("lookup", config.logfile);
+		catchsignals();
 		initdb(true);
 		switch (op) {
 		case OP_GET:
-			logthing(LOGTHING_NOTICE, "Getting keyid %llX",
+			logthing(LOGTHING_NOTICE, "Getting keyid 0x%llX",
 					keyid);
 			if (fetch_key(keyid, &publickey, false)) {
 				puts("<pre>");
+				cleankeys(publickey);
 				flatten_publickey(publickey,
 							&packets,
 							&list_end);
@@ -172,6 +174,8 @@ int main(int argc, char *argv[])
 						packets);
 				puts("</pre>");
 			} else {
+				logthing(LOGTHING_NOTICE,
+					"Failed to fetch key.");
 				puts("Key not found");
 			}
 			break;
@@ -185,12 +189,13 @@ int main(int argc, char *argv[])
 			break;
 		case OP_PHOTO:
 			if (fetch_key(keyid, &publickey, false)) {
-				struct openpgp_packet *photo = NULL;
-				photo = getphoto(publickey, 0);
-				if (photo != NULL) {
-					fwrite(photo->data+19,
+				unsigned char *photo = NULL;
+				size_t         length = 0;
+
+				if (getphoto(publickey, 0, &photo, &length)) {
+					fwrite(photo,
 							1,
-							(photo->length - 19),
+							length,
 							stdout);
 				}
 				free_publickey(publickey);