X-Git-Url: http://the.earth.li/gitweb/?a=blobdiff_plain;f=add.c;h=2c6abb93af54ba35aa13ecf223e35a54a0a61a38;hb=061e8cae3c4e66b80d2e71048dd037f0443c82cf;hp=bb12e059beb861d69afde4beea10ee4a65b3b715;hpb=42bcfe2cae29f375af4cf2cd3ccfa196b77a3946;p=onak.git diff --git a/add.c b/add.c index bb12e05..2c6abb9 100644 --- a/add.c +++ b/add.c @@ -4,6 +4,8 @@ * Jonathan McDowell * * Copyright 2002 Project Purple + * + * $Id: add.c,v 1.10 2003/06/04 20:57:06 noodles Exp $ */ #include @@ -16,9 +18,12 @@ #include "getcgi.h" #include "keydb.h" #include "keystructs.h" +#include "log.h" +#include "mem.h" +#include "merge.h" #include "onak-conf.h" #include "parsekey.h" -#include "merge.h" +#include "sendsync.h" int main(int argc, char *argv[]) { @@ -51,19 +56,27 @@ int main(int argc, char *argv[]) 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); - readconfig(); initdb(); printf("Got %d new keys.\n", - update_keys(&keys, false)); + update_keys(&keys)); + if (keys != NULL) { + sendkeysync(keys); + free_publickey(keys); + keys = NULL; + } cleanupdb(); } else { puts("No OpenPGP packets found in input."); } + cleanuplogthing(); + cleanupconfig(); } end_html(); return (EXIT_SUCCESS);