Bump debhelper compat level to 7

[onak.git] / lookup.c

diff --git a/lookup.c b/lookup.c
index e5cd1ae8e79f452cbd91169ba46db992cede62fd..e670d498f0a38189d9fb347254f3a6d1f5fa5023 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) {


@@ -87,6 +87,7 @@ int main(int argc, char *argv[])
        struct openpgp_publickey *publickey = NULL;
        struct openpgp_packet_list *packets = NULL;
        struct openpgp_packet_list *list_end = NULL;
        struct openpgp_publickey *publickey = NULL;
        struct openpgp_packet_list *packets = NULL;
        struct openpgp_packet_list *list_end = NULL;

+       int result;

 
        params = getcgivars(argc, argv);
        for (i = 0; params != NULL && params[i] != NULL; i += 2) {
 
        params = getcgivars(argc, argv);
        for (i = 0; params != NULL && params[i] != NULL; i += 2) {


@@ -159,12 +160,24 @@ 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(false);

                switch (op) {
                case OP_GET:
                switch (op) {
                case OP_GET:

-                       logthing(LOGTHING_NOTICE, "Getting keyid 0x%llX",
+                       if (ishex) {
+                               logthing(LOGTHING_NOTICE, 
+                                       "Getting keyid 0x%llX",

                                        keyid);
                                        keyid);

-                       if (fetch_key(keyid, &publickey, false)) {
+                               result = config.dbbackend->fetch_key(keyid,
+                                       &publickey, false);
+                       } else {
+                               logthing(LOGTHING_NOTICE, 
+                                       "Getting key(s) for search text %s",
+                                       search);
+                               result = config.dbbackend->fetch_key_text(
+                                       search,
+                                       &publickey);
+                       }
+                       if (result) {

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


@@ -189,11 +202,13 @@ 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;
 

-                               if (getphoto(publickey, 0, &photo, &length)) {
+                               if (getphoto(publickey, indx, &photo,
+                                               &length)) {

                                        fwrite(photo,
                                                        1,
                                                        length,
                                        fwrite(photo,
                                                        1,
                                                        length,


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

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

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