X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/ad30ce51bf609c35cd99a9ca46dd859b17d8164a..a534b3b856a1e3cbfe60bc0bca432e802f9718be:/add.c diff --git a/add.c b/add.c index 189444e..a33b0c8 100644 --- a/add.c +++ b/add.c @@ -23,7 +23,6 @@ #include "merge.h" #include "onak-conf.h" #include "parsekey.h" -#include "sendsync.h" int main(int argc, char *argv[]) { @@ -67,26 +66,33 @@ int main(int argc, char *argv[]) count = parse_keys(packets, &keys); logthing(LOGTHING_NOTICE, "Received %d keys.", count); - printf("Storing %d keys.\n", count); + printf("Key block added to key server database.\n"); + printf(" New public keys added: %d\n", count); end_html(); - fclose(stdout); - fclose(stderr); + if (stdout != NULL && fileno(stdout) != -1) { + fclose(stdout); + } + if (stderr != NULL && stderr != stdout && + fileno(stderr) != -1) { + fclose(stderr); + } catchsignals(); - initdb(false); + config.dbbackend->initdb(false); count = cleankeys(keys); logthing(LOGTHING_INFO, "%d keys cleaned.", count); - count = update_keys(&keys); + count = config.dbbackend->update_keys(&keys, true); logthing(LOGTHING_NOTICE, "Got %d new keys.", count); + if (keys != NULL) { - sendkeysync(keys); free_publickey(keys); keys = NULL; } - cleanupdb(); + + config.dbbackend->cleanupdb(); } else { puts("No OpenPGP packets found in input."); end_html();