X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/6fcdf43b866c8199065bdf5bfc05942ed79bde16..a534b3b856a1e3cbfe60bc0bca432e802f9718be:/keydb.c

diff --git a/keydb.c b/keydb.c
index 0039057..42eebfe 100644
--- 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 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) {