Move update_keys to keydb rather than merge.

[onak.git] / lookup.c

diff --git a/lookup.c b/lookup.c
index 5d638eab6ef224100a691bff9f8c170ee9498be5..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.15 2004/05/27 01:25:37 noodles Exp $

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


@@ -17,6 +15,9 @@
 
 #include "armor.h"
 #include "charfuncs.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"


@@ -157,13 +158,15 @@ 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:

-                       logthing(LOGTHING_NOTICE, "Getting keyid %llX",
+                       logthing(LOGTHING_NOTICE, "Getting keyid 0x%llX",

                                        keyid);
                        if (fetch_key(keyid, &publickey, false)) {
                                puts("<pre>");
                                        keyid);
                        if (fetch_key(keyid, &publickey, false)) {
                                puts("<pre>");

+                               cleankeys(publickey);

                                flatten_publickey(publickey,
                                                        &packets,
                                                        &list_end);
                                flatten_publickey(publickey,
                                                        &packets,
                                                        &list_end);


@@ -172,6 +175,8 @@ int main(int argc, char *argv[])
                                                packets);
                                puts("</pre>");
                        } else {
                                                packets);
                                puts("</pre>");
                        } else {

+                               logthing(LOGTHING_NOTICE,
+                                       "Failed to fetch key.");

                                puts("Key not found");
                        }
                        break;
                                puts("Key not found");
                        }
                        break;


@@ -185,12 +190,13 @@ int main(int argc, char *argv[])
                        break;
                case OP_PHOTO:
                        if (fetch_key(keyid, &publickey, false)) {
                        break;
                case OP_PHOTO:
                        if (fetch_key(keyid, &publickey, false)) {

-                               struct openpgp_packet *photo = NULL;
-                               photo = getphoto(publickey, 0);
-                               if (photo != NULL) {
-                                       fwrite(photo->data+19,
+                               unsigned char *photo = NULL;
+                               size_t         length = 0;
+
+                               if (getphoto(publickey, 0, &photo, &length)) {
+                                       fwrite(photo,

                                                        1,
                                                        1,

-                                                       (photo->length - 19),
+                                                       length,

                                                        stdout);
                                }
                                free_publickey(publickey);
                                                        stdout);
                                }
                                free_publickey(publickey);


@@ -206,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();
        }