X-Git-Url: http://the.earth.li/gitweb/?a=blobdiff_plain;f=add.c;h=2c6abb93af54ba35aa13ecf223e35a54a0a61a38;hb=38e51db0fc5b2cfb88a193e16a3f9a7c2246ac8a;hp=b0a7fd227c90f1853612aa08cb1b0d4a3c8d0fb5;hpb=34b03028378025ad22c8d29f70e81109cee690c2;p=onak.git diff --git a/add.c b/add.c index b0a7fd2..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,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(); + 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(); - cleanupconfig(); } else { puts("No OpenPGP packets found in input."); } + cleanuplogthing(); + cleanupconfig(); } end_html(); return (EXIT_SUCCESS);