Extend database backends to support fetching by key fingerprint

[onak.git] / gpgwww.c

diff --git a/gpgwww.c b/gpgwww.c
index 3b35ad7a5d9a9b7239be5ec4f1a7a59195173fef..07b448e37eff10cac7d40b211bafd1b576d91c5e 100644 (file)
--- a/gpgwww.c
+++ b/gpgwww.c
@@ -69,7 +69,6 @@ int getkeyspath(uint64_t have, uint64_t want, int count)
        struct openpgp_packet_list *list_end = NULL;
        struct stats_key *keyinfoa, *keyinfob, *curkey;
        uint64_t fullhave, fullwant;
-       int rec;
        int pathlen = 0;
 
        fullhave = config.dbbackend->getfullkeyid(have);
@@ -93,7 +92,7 @@ int getkeyspath(uint64_t have, uint64_t want, int count)
                 * Fill the tree info up.
                 */
                initcolour(true);
-               rec = findpath(keyinfoa, keyinfob);
+               findpath(keyinfoa, keyinfob);
                keyinfob->parent = 0;
                if (keyinfoa->colour == 0) {
                        pathlen = count;
@@ -105,7 +104,7 @@ int getkeyspath(uint64_t have, uint64_t want, int count)
                        curkey = findinhash(keyinfoa->parent);
                        while (curkey != NULL && curkey->keyid != 0) {
                                if (curkey->keyid != fullwant &&
-                                               config.dbbackend->fetch_key(
+                                               config.dbbackend->fetch_key_id(
                                                curkey->keyid,
                                                &publickey, false)) {
                                        flatten_publickey(publickey,
@@ -126,7 +125,7 @@ int getkeyspath(uint64_t have, uint64_t want, int count)
        /*
         * Add the destination key to the list of returned keys.
         */
-       if (config.dbbackend->fetch_key(fullwant, &publickey, false)) {
+       if (config.dbbackend->fetch_key_id(fullwant, &publickey, false)) {
                flatten_publickey(publickey,
                                &packets,
                                &list_end);