Configure basic onak.conf using autoconf info.

[onak.git] / add.c

diff --git a/add.c b/add.c
index 2aba92216a39893c362aad6f16ed5264437cd730..189444e294fb2d83af8869b3c943504c30fba810 100644 (file)
--- a/add.c
+++ b/add.c
@@ -4,8 +4,6 @@
  * Jonathan McDowell <noodles@earth.li>
  *
  * Copyright 2002 Project Purple
- *
- * $Id: add.c,v 1.13 2004/05/26 18:53:14 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"
@@ -56,6 +56,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);
@@ -63,10 +64,21 @@ int main(int argc, char *argv[])
                                        &ctx,
                                        &packets);
                if (packets != NULL) {
-                       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 = 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) {
@@ -77,10 +89,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);
 }