Move update_keys to keydb rather than merge.

[onak.git] / lookup.c

diff --git a/lookup.c b/lookup.c
index 50426004a4a6074dcd2cb27d5efc775795e2bc2f..c3b49085f59843443a1f87157e8c4fd8c704909b 100644 (file)
--- a/lookup.c
+++ b/lookup.c
@@ -4,8 +4,6 @@
  * Jonathan McDowell <noodles@earth.li>
  *
  * Copyright 2002 Project Purple
  * Jonathan McDowell <noodles@earth.li>
  *
  * Copyright 2002 Project Purple

- *
- * $Id: lookup.c,v 1.17 2004/05/31 14:16:49 noodles Exp $

  */
 
 #include <inttypes.h>
  */
 
 #include <inttypes.h>


@@ -18,6 +16,8 @@
 #include "armor.h"
 #include "charfuncs.h"
 #include "cleankey.h"
 #include "armor.h"
 #include "charfuncs.h"
 #include "cleankey.h"

+#include "cleanup.h"
+#include "config.h"

 #include "getcgi.h"
 #include "keydb.h"
 #include "keyindex.h"
 #include "getcgi.h"
 #include "keydb.h"
 #include "keyindex.h"


@@ -158,6 +158,7 @@ int main(int argc, char *argv[])
        } else {
                readconfig(NULL);
                initlogthing("lookup", config.logfile);
        } else {
                readconfig(NULL);
                initlogthing("lookup", config.logfile);

+               catchsignals();

                initdb(true);
                switch (op) {
                case OP_GET:
                initdb(true);
                switch (op) {
                case OP_GET:


@@ -211,7 +212,8 @@ int main(int argc, char *argv[])
        }
        if (!mrhkp) {
                puts("<hr>");
        }
        if (!mrhkp) {
                puts("<hr>");

-               puts("Produced by onak " VERSION " by Jonathan McDowell");
+               puts("Produced by onak " PACKAGE_VERSION 
+                               " by Jonathan McDowell");

                end_html();
        }
 
                end_html();
        }