Use common function for command sending in keyd client code

[onak.git] / keydb.c

diff --git a/keydb.c b/keydb.c
index 14418fb7a012e86b2de55f494dd941b3654e609e..354255fecea07fce1b9ca6a2e64aacbdecf9ab7a 100644 (file)
--- 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);