X-Git-Url: https://the.earth.li/gitweb/?a=blobdiff_plain;f=add.c;h=a784fac358fb4d9565c84dfb274734b2c61d89df;hb=807aad387f6698a1eec1acf340496f064cb04cbb;hp=2a99036adbe2fe017359f00962a027b8a9127fce;hpb=3b5b9db0bc2dbe93b3b79e722997606c71ecafb9;p=onak.git

diff --git a/add.c b/add.c
index 2a99036..a784fac 100644
--- a/add.c
+++ b/add.c
@@ -12,6 +12,7 @@
 #include <string.h>
 
 #include "armor.h"
+#include "cleankey.h"
 #include "charfuncs.h"
 #include "getcgi.h"
 #include "keydb.h"
@@ -25,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));
 
@@ -53,17 +55,29 @@ 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();
+		readconfig(NULL);
 		initlogthing("add", config.logfile);
 		dearmor_openpgp_stream(buffer_fetchchar,
 					&ctx,
 					&packets);
 		if (packets != NULL) {
-			parse_keys(packets, &keys);
-			initdb();
-			printf("Got %d new keys.\n",
-					update_keys(&keys));
+			printf("Storing %d keys.\n",
+				parse_keys(packets, &keys));
+			end_html();
+			fclose(stdout);
+			fclose(stderr);
+			initdb(false);
+			
+			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);
@@ -72,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);
 }