X-Git-Url: http://the.earth.li/gitweb/?a=blobdiff_plain;f=add.c;h=a784fac358fb4d9565c84dfb274734b2c61d89df;hb=8b4052ad6015aa9f54c9c824f28655f230d09d8d;hp=f90dd88be53a10d7e809ea7e2ecb30fe71f4a298;hpb=cd002cef518222c140de94b8817874b072b2d918;p=onak.git

diff --git a/add.c b/add.c
index f90dd88..a784fac 100644
--- a/add.c
+++ b/add.c
@@ -4,8 +4,6 @@
  * Jonathan McDowell <noodles@earth.li>
  *
  * Copyright 2002 Project Purple
- *
- * $Id: add.c,v 1.12 2004/03/23 12:33:46 noodles Exp $
  */
 
 #include <errno.h>
@@ -14,6 +12,7 @@
 #include <string.h>
 
 #include "armor.h"
+#include "cleankey.h"
 #include "charfuncs.h"
 #include "getcgi.h"
 #include "keydb.h"
@@ -27,11 +26,12 @@
 
 int main(int argc, char *argv[])
 {
-	struct openpgp_packet_list *packets = NULL;
-	struct openpgp_publickey *keys = NULL;
-	char **params = NULL;
-	struct buffer_ctx ctx;
-	int i;
+	struct openpgp_packet_list  *packets = NULL;
+	struct openpgp_publickey    *keys = NULL;
+	char                       **params = NULL;
+	struct buffer_ctx            ctx;
+	int                          count = 0;
+	int                          i;
 
 	memset(&ctx, 0, sizeof(ctx));
 
@@ -55,6 +55,7 @@ int main(int argc, char *argv[])
 	start_html("onak : Add");
 	if (ctx.buffer == NULL) {
 		puts("Error: No keytext to add supplied.");
+		end_html();
 	} else {
 		readconfig(NULL);
 		initlogthing("add", config.logfile);
@@ -62,10 +63,21 @@ int main(int argc, char *argv[])
 					&ctx,
 					&packets);
 		if (packets != NULL) {
-			parse_keys(packets, &keys);
+			printf("Storing %d keys.\n",
+				parse_keys(packets, &keys));
+			end_html();
+			fclose(stdout);
+			fclose(stderr);
 			initdb(false);
-			printf("Got %d new keys.\n",
-					update_keys(&keys));
+			
+			count = cleankeys(keys);
+			logthing(LOGTHING_INFO, "%d keys cleaned.",
+					count);
+
+			count = update_keys(&keys);
+			printf("Got %d new keys.\n", count);
+			logthing(LOGTHING_NOTICE, "Got %d new keys.",
+				count);
 			if (keys != NULL) {
 				sendkeysync(keys);
 				free_publickey(keys);
@@ -74,10 +86,10 @@ int main(int argc, char *argv[])
 			cleanupdb();
 		} else {
 			puts("No OpenPGP packets found in input.");
+			end_html();
 		}
 		cleanuplogthing();
 		cleanupconfig();
 	}
-	end_html();
 	return (EXIT_SUCCESS);
 }