X-Git-Url: http://the.earth.li/gitweb/?a=blobdiff_plain;f=add.c;h=167e5bd46aa13a0380fcd8e288eecce19f2cb478;hb=408ea0b9ceafdc9f861701cfb14b57d09aa47777;hp=189444e294fb2d83af8869b3c943504c30fba810;hpb=ad30ce51bf609c35cd99a9ca46dd859b17d8164a;p=onak.git diff --git a/add.c b/add.c index 189444e..167e5bd 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[]) { @@ -69,8 +68,13 @@ int main(int argc, char *argv[]) count); printf("Storing %d keys.\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); @@ -78,14 +82,15 @@ int main(int argc, char *argv[]) logthing(LOGTHING_INFO, "%d keys cleaned.", count); - count = update_keys(&keys); + 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.");