X-Git-Url: http://the.earth.li/gitweb/?a=blobdiff_plain;f=lookup.c;h=e5cd1ae8e79f452cbd91169ba46db992cede62fd;hb=8bc9630c93bdf4c659c04fbf6e86eec5446ed882;hp=123ec5f1ee936aa91f9750fe5928031b89793407;hpb=b3e534f945ae56605bc5309e7c5af020c797a69b;p=onak.git

diff --git a/lookup.c b/lookup.c
index 123ec5f..e5cd1ae 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.16 2004/05/27 21:58:18 noodles Exp $
  */
 
 #include <inttypes.h>
@@ -17,6 +15,9 @@
 
 #include "armor.h"
 #include "charfuncs.h"
+#include "cleankey.h"
+#include "cleanup.h"
+#include "config.h"
 #include "getcgi.h"
 #include "keydb.h"
 #include "keyindex.h"
@@ -103,7 +104,7 @@ int main(int argc, char *argv[])
 			search = params[i+1];
 			params[i+1] = NULL;
 			if (search != NULL) {
-				keyid = strtoul(search, &end, 16);
+				keyid = strtoull(search, &end, 16);
 				if (*search != 0 &&
 						end != NULL &&
 						*end == 0) {
@@ -157,6 +158,7 @@ int main(int argc, char *argv[])
 	} else {
 		readconfig(NULL);
 		initlogthing("lookup", config.logfile);
+		catchsignals();
 		initdb(true);
 		switch (op) {
 		case OP_GET:
@@ -164,6 +166,7 @@ int main(int argc, char *argv[])
 					keyid);
 			if (fetch_key(keyid, &publickey, false)) {
 				puts("<pre>");
+				cleankeys(publickey);
 				flatten_publickey(publickey,
 							&packets,
 							&list_end);
@@ -209,7 +212,8 @@ int main(int argc, char *argv[])
 	}
 	if (!mrhkp) {
 		puts("<hr>");
-		puts("Produced by onak " VERSION " by Jonathan McDowell");
+		puts("Produced by onak " PACKAGE_VERSION 
+				" by Jonathan McDowell");
 		end_html();
 	}