Use C99 uint32_t rather than u_int32_t

[onak.git] / keydb.c

diff --git a/keydb.c b/keydb.c
index 339450bda290f1d0c99166836dbb6f86800696c1..00bb3ff815e2216f8042934cdced6747c59642f5 100644 (file)
--- a/keydb.c
+++ b/keydb.c
@@ -1,9 +1,20 @@
 /*
  * keydb.c - Routines for DB access that just use store/fetch.
  *
- * Jonathan McDowell <noodles@earth.li>
+ * Copyright 2002-2004 Jonathan McDowell <noodles@earth.li>
  *
- * Copyright 2002-2004 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.
  */
 
 /**
@@ -23,6 +34,7 @@
 #include "keystructs.h"
 #include "mem.h"
 #include "merge.h"
+#include "openpgp.h"
 #include "parsekey.h"
 #include "sendsync.h"
 
@@ -42,7 +54,7 @@ char *generic_keyid2uid(uint64_t keyid)
                        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);
@@ -105,16 +117,24 @@ struct ll *generic_cached_getkeysigs(uint64_t keyid)
        struct stats_key *key = NULL;
        struct stats_key *signedkey = NULL;
        struct ll        *cursig = NULL;
+       struct ll        *sigs = NULL;
        bool              revoked = false;
 
        if (keyid == 0)  {
                return NULL;
        }
 
-       key = createandaddtohash(keyid);
+       key = findinhash(keyid);
 
-       if (key->gotsigs == false) {
-               key->sigs = config.dbbackend->getkeysigs(key->keyid, &revoked);
+       if (key == NULL || key->gotsigs == false) {
+               sigs = config.dbbackend->getkeysigs(keyid, &revoked);
+               if (sigs == NULL) {
+                       return NULL;
+               }
+               if (key == NULL) {
+                       key = createandaddtohash(keyid);
+               }
+               key->sigs = sigs;
                key->revoked = revoked;
                for (cursig = key->sigs; cursig != NULL;
                                cursig = cursig->next) {
@@ -177,7 +197,7 @@ int generic_update_keys(struct openpgp_publickey **keys, bool sendsync)
        for (curkey = *keys; curkey != NULL; curkey = curkey->next) {
                intrans = config.dbbackend->starttrans();
                logthing(LOGTHING_INFO,
-                       "Fetching key 0x%llX, result: %d",
+                       "Fetching key 0x%" PRIX64 ", result: %d",
                        get_keyid(curkey),
                        config.dbbackend->fetch_key(get_keyid(curkey), &oldkey,
                                        intrans));
@@ -205,7 +225,8 @@ int generic_update_keys(struct openpgp_publickey **keys, bool sendsync)
                                prev = curkey;
                                logthing(LOGTHING_INFO,
                                        "Merged key; storing updated key.");
-                               store_key(oldkey, intrans, true);
+                               config.dbbackend->store_key(oldkey, intrans,
+                                       true);
                        }
                        free_publickey(oldkey);
                        oldkey = NULL;