Update Debian Vcs-* fields to point to git repository

[onak.git] / keydb_dynamic.c

diff --git a/keydb_dynamic.c b/keydb_dynamic.c
index fa4b13b9fb6f9c01039e3246ad27360c7aad8c9f..65373860461243548727048858493850d2a597d7 100644 (file)
--- a/keydb_dynamic.c
+++ b/keydb_dynamic.c
@@ -1,9 +1,20 @@
 /*
  * keydb_dynamic.c - backend that can load the other backends
  *
- * Brett Parker <iDunno@sommitrealweird.co.uk>
+ * Copyright 2005 Brett Parker <iDunno@sommitrealweird.co.uk>
  *
- * Copyright 2005 Project Purple
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #include <dlfcn.h>
@@ -19,6 +30,7 @@
 #include "mem.h"
 #include "merge.h"
 #include "onak-conf.h"
+#include "openpgp.h"
 #include "parsekey.h"
 #include "sendsync.h"
 
@@ -198,6 +210,23 @@ static int dynamic_fetch_key_text(const char *search,
        return -1;
 }
 
+static int dynamic_fetch_key_skshash(const struct skshash *hash,
+               struct openpgp_publickey **publickey)
+{
+       if (loaded_backend == NULL) {
+               load_backend();
+       }
+       
+       if (loaded_backend != NULL) {
+               if (loaded_backend->fetch_key_skshash != NULL) {
+                       return loaded_backend->fetch_key_skshash(hash,
+                                                               publickey);
+               }
+       }
+
+       return -1;
+}
+
 static int dynamic_iterate_keys(void (*iterfunc)(void *ctx,
                struct openpgp_publickey *key), void *ctx)
 {
@@ -238,7 +267,7 @@ static char *dynamic_keyid2uid(uint64_t keyid)
        if (dynamic_fetch_key(keyid, &publickey, false) && publickey != NULL) {
                curuid = publickey->uids;
                while (curuid != NULL && buf[0] == 0) {
-                       if (curuid->packet->tag == 13) {
+                       if (curuid->packet->tag == OPENPGP_PACKET_UID) {
                                snprintf(buf, 1023, "%.*s",
                                                (int) curuid->packet->length,
                                                curuid->packet->data);
@@ -364,7 +393,7 @@ static uint64_t dynamic_getfullkeyid(uint64_t keyid)
        if (keyid < 0x100000000LL) {
                dynamic_fetch_key(keyid, &publickey, false);
                if (publickey != NULL) {
-                       keyid = get_keyid(publickey);
+                       get_keyid(publickey, &keyid);
                        free_publickey(publickey);
                        publickey = NULL;
                } else {
@@ -393,6 +422,7 @@ static int dynamic_update_keys(struct openpgp_publickey **keys, bool sendsync)
        struct openpgp_publickey *prev = NULL;
        int newkeys = 0;
        bool intrans;
+       uint64_t keyid;
        
        if (loaded_backend == NULL) {
                load_backend();
@@ -406,10 +436,11 @@ static int dynamic_update_keys(struct openpgp_publickey **keys, bool sendsync)
 
        for (curkey = *keys; curkey != NULL; curkey = curkey->next) {
                intrans = dynamic_starttrans();
+               get_keyid(curkey, &keyid);
                logthing(LOGTHING_INFO,
                        "Fetching key 0x%" PRIX64 ", result: %d",
-                       get_keyid(curkey),
-                       dynamic_fetch_key(get_keyid(curkey), &oldkey, intrans));
+                       keyid,
+                       dynamic_fetch_key(keyid, &oldkey, intrans));
 
                /*
                 * If we already have the key stored in the DB then merge it
@@ -487,6 +518,7 @@ struct dbfuncs keydb_dynamic_funcs = {
        .endtrans               = dynamic_endtrans,
        .fetch_key              = dynamic_fetch_key,
        .fetch_key_text         = dynamic_fetch_key_text,
+       .fetch_key_skshash      = dynamic_fetch_key_skshash,
        .store_key              = dynamic_store_key,
        .update_keys            = dynamic_update_keys,
        .delete_key             = dynamic_delete_key,