Make keyd background itself by default

[onak.git] / keydb.c

diff --git a/keydb.c b/keydb.c
index 339450bda290f1d0c99166836dbb6f86800696c1..42eebfe3a34c8b1e0ee4bc0c6b1c9ed9bafa0914 100644 (file)
--- a/keydb.c
+++ b/keydb.c
@@ -105,16 +105,24 @@ struct ll *generic_cached_getkeysigs(uint64_t keyid)
        struct stats_key *key = NULL;
        struct stats_key *signedkey = NULL;
        struct ll        *cursig = NULL;
        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;
        }
 
        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) {
                key->revoked = revoked;
                for (cursig = key->sigs; cursig != NULL;
                                cursig = cursig->next) {


@@ -205,7 +213,8 @@ int generic_update_keys(struct openpgp_publickey **keys, bool sendsync)
                                prev = curkey;
                                logthing(LOGTHING_INFO,
                                        "Merged key; storing updated key.");
                                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;
                        }
                        free_publickey(oldkey);
                        oldkey = NULL;