0.3.5 release.

[onak.git] / lookup.c

diff --git a/lookup.c b/lookup.c
index c3b49085f59843443a1f87157e8c4fd8c704909b..d48bc3f7cdbd30dfb428c1814d83e72c77ceb6ae 100644 (file)
--- a/lookup.c
+++ b/lookup.c
@@ -40,9 +40,9 @@ void find_keys(char *search, uint64_t keyid, bool ishex,
        int count = 0;
 
        if (ishex) {
        int count = 0;
 
        if (ishex) {

-               count = fetch_key(keyid, &publickey, false);
+               count = config.dbbackend->fetch_key(keyid, &publickey, false);

        } else {
        } else {

-               count = fetch_key_text(search, &publickey);
+               count = config.dbbackend->fetch_key_text(search, &publickey);

        }
        if (publickey != NULL) {
                if (mrhkp) {
        }
        if (publickey != NULL) {
                if (mrhkp) {


@@ -104,7 +104,7 @@ int main(int argc, char *argv[])
                        search = params[i+1];
                        params[i+1] = NULL;
                        if (search != NULL) {
                        search = params[i+1];
                        params[i+1] = NULL;
                        if (search != NULL) {

-                               keyid = strtoul(search, &end, 16);
+                               keyid = strtoull(search, &end, 16);

                                if (*search != 0 &&
                                                end != NULL &&
                                                *end == 0) {
                                if (*search != 0 &&
                                                end != NULL &&
                                                *end == 0) {


@@ -159,12 +159,13 @@ int main(int argc, char *argv[])
                readconfig(NULL);
                initlogthing("lookup", config.logfile);
                catchsignals();
                readconfig(NULL);
                initlogthing("lookup", config.logfile);
                catchsignals();

-               initdb(true);
+               config.dbbackend->initdb(true);

                switch (op) {
                case OP_GET:
                        logthing(LOGTHING_NOTICE, "Getting keyid 0x%llX",
                                        keyid);
                switch (op) {
                case OP_GET:
                        logthing(LOGTHING_NOTICE, "Getting keyid 0x%llX",
                                        keyid);

-                       if (fetch_key(keyid, &publickey, false)) {
+                       if (config.dbbackend->fetch_key(keyid, &publickey,
+                                       false)) {

                                puts("<pre>");
                                cleankeys(publickey);
                                flatten_publickey(publickey,
                                puts("<pre>");
                                cleankeys(publickey);
                                flatten_publickey(publickey,


@@ -189,7 +190,8 @@ int main(int argc, char *argv[])
                                        true, mrhkp);
                        break;
                case OP_PHOTO:
                                        true, mrhkp);
                        break;
                case OP_PHOTO:

-                       if (fetch_key(keyid, &publickey, false)) {
+                       if (config.dbbackend->fetch_key(keyid, &publickey,
+                                       false)) {

                                unsigned char *photo = NULL;
                                size_t         length = 0;
 
                                unsigned char *photo = NULL;
                                size_t         length = 0;
 


@@ -206,7 +208,7 @@ int main(int argc, char *argv[])
                default:
                        puts("Unknown operation!");
                }
                default:
                        puts("Unknown operation!");
                }

-               cleanupdb();
+               config.dbbackend->cleanupdb();

                cleanuplogthing();
                cleanupconfig();
        }
                cleanuplogthing();
                cleanupconfig();
        }