X-Git-Url: http://the.earth.li/gitweb/?a=blobdiff_plain;f=keydb.c;h=354255fecea07fce1b9ca6a2e64aacbdecf9ab7a;hb=0b6d1c2f02adbb84ca03290f34368307a5e08131;hp=14418fb7a012e86b2de55f494dd941b3654e609e;hpb=8e0907be1d73011075a99a0c029c56664e12843e;p=onak.git

diff --git a/keydb.c b/keydb.c
index 14418fb..354255f 100644
--- a/keydb.c
+++ b/keydb.c
@@ -241,7 +241,6 @@ int generic_update_keys(struct onak_dbctx *dbctx,
 			newkeys++;
 		}
 		dbctx->endtrans(dbctx);
-		intrans = false;
 	}
 
 	if (sendsync && keys != NULL) {
@@ -254,13 +253,13 @@ int generic_update_keys(struct onak_dbctx *dbctx,
 
 #ifdef NEED_GET_FP
 static int generic_fetch_key_fp(struct onak_dbctx *dbctx,
-		uint8_t *fp, size_t fpsize,
+		struct openpgp_fingerprint *fingerprint,
 		struct openpgp_publickey **publickey, bool intrans)
 {
 	uint64_t keyid;
 	int i;
 
-	if (fpsize > MAX_FINGERPRINT_LEN) {
+	if (fingerprint->length > MAX_FINGERPRINT_LEN) {
 		return 0;
 	}
 
@@ -272,8 +271,8 @@ static int generic_fetch_key_fp(struct onak_dbctx *dbctx,
 	 * if the backend can't do it we're going to fail anyway.
 	 */
 	keyid = 0;
-	for (i = (fpsize - 8); i < fpsize; i++) {
-		keyid = (keyid << 8) + fp[i];
+	for (i = (fingerprint->length - 8); i < fingerprint->length; i++) {
+		keyid = (keyid << 8) + fingerprint->fp[i];
 	}
 
 	return dbctx->fetch_key_id(dbctx, keyid, publickey, intrans);