X-Git-Url: http://the.earth.li/gitweb/?a=blobdiff_plain;f=add.c;h=10627f281105d8bb3369aaf5c122b7d37e2086c0;hb=17623ae905ff751306ed51a30fd0ee97ffd00d01;hp=2d38624d3f43dea1ac8e186b388d05ffe016e255;hpb=393d83b8760584006eaefd6fc370abead228e02a;p=onak.git diff --git a/add.c b/add.c index 2d38624..10627f2 100644 --- a/add.c +++ b/add.c @@ -13,6 +13,7 @@ #include "armor.h" #include "cleankey.h" +#include "cleanup.h" #include "charfuncs.h" #include "getcgi.h" #include "keydb.h" @@ -22,7 +23,6 @@ #include "merge.h" #include "onak-conf.h" #include "parsekey.h" -#include "sendsync.h" int main(int argc, char *argv[]) { @@ -70,21 +70,22 @@ int main(int argc, char *argv[]) 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); + count = update_keys(&keys, true); logthing(LOGTHING_NOTICE, "Got %d new keys.", count); + if (keys != NULL) { - sendkeysync(keys); free_publickey(keys); keys = NULL; } + cleanupdb(); } else { puts("No OpenPGP packets found in input.");