X-Git-Url: http://the.earth.li/gitweb/?a=blobdiff_plain;f=add.c;h=46f5ecf1e926a1553e06320b15acc4b9e40ab65e;hb=fd58db2034c6781399583384055ce69fc300b26b;hp=32016b5a63d8a2ce782f44e24c0c392ad441c7ff;hpb=1d268f8b7df33d0985b63f7f99b9e3ed597a9982;p=onak.git

diff --git a/add.c b/add.c
index 32016b5..46f5ecf 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.14 2004/05/26 21:20:05 noodles Exp $
  */
 
 #include <errno.h>
@@ -14,6 +12,8 @@
 #include <string.h>
 
 #include "armor.h"
+#include "cleankey.h"
+#include "cleanup.h"
 #include "charfuncs.h"
 #include "getcgi.h"
 #include "keydb.h"
@@ -64,21 +64,29 @@ int main(int argc, char *argv[])
 					&ctx,
 					&packets);
 		if (packets != NULL) {
-			printf("Storing %d keys.\n",
-				parse_keys(packets, &keys));
+			count = parse_keys(packets, &keys);
+			logthing(LOGTHING_NOTICE, "Received %d keys.",
+				count);
+			printf("Storing %d keys.\n", count);
 			end_html();
 			fclose(stdout);
 			fclose(stderr);
+			catchsignals();
 			initdb(false);
-			count = update_keys(&keys);
-			printf("Got %d new keys.\n", count);
+			
+			count = cleankeys(keys);
+			logthing(LOGTHING_INFO, "%d keys cleaned.",
+					count);
+
+			count = update_keys(&keys, true);
 			logthing(LOGTHING_NOTICE, "Got %d new keys.",
 				count);
+
 			if (keys != NULL) {
-				sendkeysync(keys);
 				free_publickey(keys);
 				keys = NULL;
 			}
+			
 			cleanupdb();
 		} else {
 			puts("No OpenPGP packets found in input.");