X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/7f046503b8b8dcec51c1f7752e87ba0ba0af0631..bccee9f66efda51a5e900ea57b5a130f2e99faf1:/add.c?ds=inline

diff --git a/add.c b/add.c
index 2aee761..a33b0c8 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.11 2003/10/15 21:15:20 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"
@@ -23,15 +23,15 @@
 #include "merge.h"
 #include "onak-conf.h"
 #include "parsekey.h"
-#include "sendsync.h"
 
 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,22 +63,42 @@ int main(int argc, char *argv[])
 					&ctx,
 					&packets);
 		if (packets != NULL) {
-			parse_keys(packets, &keys);
-			initdb();
-			printf("Got %d new keys.\n",
-					update_keys(&keys));
+			count = parse_keys(packets, &keys);
+			logthing(LOGTHING_NOTICE, "Received %d keys.",
+				count);
+			printf("Key block added to key server database.\n");
+			printf("  New public keys added: %d\n", count);
+			end_html();
+			if (stdout != NULL && fileno(stdout) != -1) {
+				fclose(stdout);
+			}
+			if (stderr != NULL && stderr != stdout &&
+					fileno(stderr) != -1) {
+				fclose(stderr);
+			}
+			catchsignals();
+			config.dbbackend->initdb(false);
+			
+			count = cleankeys(keys);
+			logthing(LOGTHING_INFO, "%d keys cleaned.",
+					count);
+
+			count = config.dbbackend->update_keys(&keys, true);
+			logthing(LOGTHING_NOTICE, "Got %d new keys.",
+				count);
+
 			if (keys != NULL) {
-				sendkeysync(keys);
 				free_publickey(keys);
 				keys = NULL;
 			}
-			cleanupdb();
+			
+			config.dbbackend->cleanupdb();
 		} else {
 			puts("No OpenPGP packets found in input.");
+			end_html();
 		}
 		cleanuplogthing();
 		cleanupconfig();
 	}
-	end_html();
 	return (EXIT_SUCCESS);
 }