X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/34b03028378025ad22c8d29f70e81109cee690c2..5ba02c41963a4c4077a873a3c686a61cb84d56b7:/add.c

diff --git a/add.c b/add.c
index b0a7fd2..f90dd88 100644
--- a/add.c
+++ b/add.c
@@ -4,6 +4,8 @@
  * 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>
@@ -16,6 +18,7 @@
 #include "getcgi.h"
 #include "keydb.h"
 #include "keystructs.h"
+#include "log.h"
 #include "mem.h"
 #include "merge.h"
 #include "onak-conf.h"
@@ -53,25 +56,27 @@ int main(int argc, char *argv[])
 	if (ctx.buffer == NULL) {
 		puts("Error: No keytext to add supplied.");
 	} else {
+		readconfig(NULL);
+		initlogthing("add", config.logfile);
 		dearmor_openpgp_stream(buffer_fetchchar,
 					&ctx,
 					&packets);
 		if (packets != NULL) {
 			parse_keys(packets, &keys);
-			readconfig();
-			initdb();
+			initdb(false);
 			printf("Got %d new keys.\n",
-					update_keys(&keys, false));
+					update_keys(&keys));
 			if (keys != NULL) {
 				sendkeysync(keys);
 				free_publickey(keys);
 				keys = NULL;
 			}
 			cleanupdb();
-			cleanupconfig();
 		} else {
 			puts("No OpenPGP packets found in input.");
 		}
+		cleanuplogthing();
+		cleanupconfig();
 	}
 	end_html();
 	return (EXIT_SUCCESS);