X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/42bcfe2cae29f375af4cf2cd3ccfa196b77a3946..44169bea490150f3c2bb2b20ba086cae77d89041:/add.c?ds=sidebyside diff --git a/add.c b/add.c index bb12e05..f90dd88 100644 --- a/add.c +++ b/add.c @@ -4,6 +4,8 @@ * Jonathan McDowell * * Copyright 2002 Project Purple + * + * $Id: add.c,v 1.12 2004/03/23 12:33:46 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(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(); } else { puts("No OpenPGP packets found in input."); } + cleanuplogthing(); + cleanupconfig(); } end_html(); return (EXIT_SUCCESS);