cscvs to tla changeset 80

[onak.git] / add.c

diff --git a/add.c b/add.c
index f65203c3a06b906486686e8c131f8a2f093aeade..2c6abb93af54ba35aa13ecf223e35a54a0a61a38 100644 (file)
--- a/add.c
+++ b/add.c
@@ -4,6 +4,8 @@
  * Jonathan McDowell <noodles@earth.li>
  *
  * Copyright 2002 Project Purple
  * Jonathan McDowell <noodles@earth.li>
  *
  * Copyright 2002 Project Purple

+ *
+ * $Id: add.c,v 1.10 2003/06/04 20:57:06 noodles Exp $

  */
 
 #include <errno.h>
  */
 
 #include <errno.h>


@@ -16,6 +18,7 @@
 #include "getcgi.h"
 #include "keydb.h"
 #include "keystructs.h"
 #include "getcgi.h"
 #include "keydb.h"
 #include "keystructs.h"

+#include "log.h"

 #include "mem.h"
 #include "merge.h"
 #include "onak-conf.h"
 #include "mem.h"
 #include "merge.h"
 #include "onak-conf.h"


@@ -53,15 +56,16 @@ int main(int argc, char *argv[])
        if (ctx.buffer == NULL) {
                puts("Error: No keytext to add supplied.");
        } else {
        if (ctx.buffer == NULL) {
                puts("Error: No keytext to add supplied.");
        } else {

+               readconfig();
+               initlogthing("add", config.logfile);

                dearmor_openpgp_stream(buffer_fetchchar,
                                        &ctx,
                                        &packets);
                if (packets != NULL) {
                        parse_keys(packets, &keys);
                dearmor_openpgp_stream(buffer_fetchchar,
                                        &ctx,
                                        &packets);
                if (packets != NULL) {
                        parse_keys(packets, &keys);

-                       readconfig();

                        initdb();
                        printf("Got %d new keys.\n",
                        initdb();
                        printf("Got %d new keys.\n",

-                                       update_keys(&keys, false));
+                                       update_keys(&keys));

                        if (keys != NULL) {
                                sendkeysync(keys);
                                free_publickey(keys);
                        if (keys != NULL) {
                                sendkeysync(keys);
                                free_publickey(keys);


@@ -71,6 +75,8 @@ int main(int argc, char *argv[])
                } else {
                        puts("No OpenPGP packets found in input.");
                }
                } else {
                        puts("No OpenPGP packets found in input.");
                }

+               cleanuplogthing();
+               cleanupconfig();

        }
        end_html();
        return (EXIT_SUCCESS);
        }
        end_html();
        return (EXIT_SUCCESS);