X-Git-Url: https://the.earth.li/gitweb/?a=blobdiff_plain;f=keydb_keyring.c;h=9550434c612d5b027f3cf4a369b001d696d8e9fe;hb=b9ea568af87d8b9c4d9afb0819ac20f8e2c3f885;hp=e3f8584a05df3c492e768679fd59921d773f8081;hpb=a94e29c9a3763f96b1c773f0818b97e4fd0777b0;p=onak.git

diff --git a/keydb_keyring.c b/keydb_keyring.c
index e3f8584..9550434 100644
--- a/keydb_keyring.c
+++ b/keydb_keyring.c
@@ -85,7 +85,7 @@ static int keyring_fetch_key(struct onak_keyring_dbctx *privctx,
 	if (index > privctx->count)
 		return 0;
 
-	buf.buffer = privctx->keys[index].start;
+	buf.buffer = (char *) privctx->keys[index].start;
 	buf.size = privctx->keys[index].len;
 	buf.offset = 0;
 
@@ -224,6 +224,7 @@ static int keyring_iterate_keys(struct onak_dbctx *dbctx,
 static int keyring_update_keys(struct onak_dbctx *dbctx,
 		struct openpgp_publickey **keys,
 		struct keyarray *blacklist,
+		bool updateonly,
 		bool sendsync)
 {
 	return 0;
@@ -234,7 +235,6 @@ static int keyring_update_keys(struct onak_dbctx *dbctx,
  */
 #define NEED_KEYID2UID 1
 #define NEED_GETKEYSIGS 1
-#define NEED_GET_FP 1
 #include "keydb.c"
 
 static int keyring_parse_keys(struct onak_keyring_dbctx *privctx)
@@ -266,7 +266,7 @@ static int keyring_parse_keys(struct onak_keyring_dbctx *privctx)
 				len += privctx->file[pos + 2];
 				len += 192;
 				len += 1; /* Header */
-			} else if (len > 223 & len < 255) {
+			} else if (len > 223 && len < 255) {
 				// Unsupported
 			} else if (len == 255) {
 				len = privctx->file[pos + 2];