X-Git-Url: http://the.earth.li/gitweb/?a=blobdiff_plain;f=onak.c;h=e79e565a79779c08218101ea0c806f3ccedf6011;hb=17623ae905ff751306ed51a30fd0ee97ffd00d01;hp=9af2c4310b21959d100ab0f9b987ae8acec2b940;hpb=394938c479925750ffe56c28d281945ba4003a14;p=onak.git

diff --git a/onak.c b/onak.c
index 9af2c43..e79e565 100644
--- a/onak.c
+++ b/onak.c
@@ -17,6 +17,8 @@
 #include "armor.h"
 #include "charfuncs.h"
 #include "cleankey.h"
+#include "cleanup.h"
+#include "config.h"
 #include "keydb.h"
 #include "keyid.h"
 #include "keyindex.h"
@@ -53,7 +55,7 @@ void find_keys(char *search, uint64_t keyid, bool ishex,
 }
 
 void usage(void) {
-	puts("onak " VERSION " - an OpenPGP keyserver.\n");
+	puts("onak " PACKAGE_VERSION " - an OpenPGP keyserver.\n");
 	puts("Usage:\n");
 	puts("\tonak [options] <command> <parameters>\n");
 	puts("\tCommands:\n");
@@ -113,6 +115,7 @@ int main(int argc, char *argv[])
 
 	readconfig(configfile);
 	initlogthing("onak", config.logfile);
+	catchsignals();
 
 	if ((argc - optind) < 1) {
 		usage();
@@ -142,7 +145,7 @@ int main(int argc, char *argv[])
 
 			initdb(false);
 			logthing(LOGTHING_NOTICE, "Got %d new keys.",
-					update_keys(&keys));
+					update_keys(&keys, false));
 			if (keys != NULL && update) {
 				flatten_publickey(keys,
 					&packets,