X-Git-Url: http://the.earth.li/gitweb/?a=blobdiff_plain;f=keydb_dynamic.c;h=65373860461243548727048858493850d2a597d7;hb=f31f6d8cf4bda52b8ef1b1d1d280884e904429a9;hp=10bec165e6decd21c6820095fd6f21abfd0057fa;hpb=5e1b22d763640c4d7a09d07920403d8d491b4410;p=onak.git

diff --git a/keydb_dynamic.c b/keydb_dynamic.c
index 10bec16..6537386 100644
--- a/keydb_dynamic.c
+++ b/keydb_dynamic.c
@@ -393,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 {
@@ -422,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();
@@ -435,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