X-Git-Url: https://the.earth.li/gitweb/?a=blobdiff_plain;f=keydb_stacked.c;h=7e997d99d08cf784bc48e29e7f5d4f67fb502ebc;hb=c3fe49f62ac8d87e4e0ac836891792e9c10035a2;hp=c715c63172d2449cacaea01882785cb7936016d4;hpb=5cb163e87c7f0717aa94ca281a56e572c2a6c8f3;p=onak.git

diff --git a/keydb_stacked.c b/keydb_stacked.c
index c715c63..7e997d9 100644
--- a/keydb_stacked.c
+++ b/keydb_stacked.c
@@ -85,14 +85,18 @@ static int stacked_delete_key(struct onak_dbctx *dbctx,
 }
 
 static int stacked_update_keys(struct onak_dbctx *dbctx,
-		struct openpgp_publickey **keys, bool sendsync)
+		struct openpgp_publickey **keys,
+		struct keyarray *blacklist,
+		bool updateonly,
+		bool sendsync)
 {
 	struct onak_stacked_dbctx *privctx =
 			(struct onak_stacked_dbctx *) dbctx->priv;
 	struct onak_dbctx *backend =
 			(struct onak_dbctx *) privctx->backends->object;
 
-	return backend->update_keys(backend, keys, sendsync);
+	return backend->update_keys(backend, keys, blacklist, updateonly,
+			sendsync);
 }
 
 static int stacked_iterate_keys(struct onak_dbctx *dbctx,
@@ -231,7 +235,6 @@ static int stacked_fetch_key_skshash(struct onak_dbctx *dbctx,
  */
 #define NEED_KEYID2UID 1
 #define NEED_GETKEYSIGS 1
-#define NEED_GETFULLKEYID 1
 #define NEED_UPDATEKEYS 1
 #include "keydb.c"
 
@@ -286,23 +289,6 @@ static char *stacked_keyid2uid(struct onak_dbctx *dbctx,
 	return res;
 }
 
-static uint64_t stacked_getfullkeyid(struct onak_dbctx *dbctx,
-		uint64_t keyid)
-{
-	struct onak_stacked_dbctx *privctx =
-			(struct onak_stacked_dbctx *) dbctx->priv;
-	struct onak_dbctx *backend =
-			(struct onak_dbctx *) privctx->backends->object;
-	uint64_t res = 0;
-
-	res = backend->getfullkeyid(backend, keyid);
-	if (res == 0) {
-		res = generic_getfullkeyid(dbctx, keyid);
-	}
-
-	return res;
-}
-
 static void stacked_cleanupdb(struct onak_dbctx *dbctx)
 {
 	struct onak_stacked_dbctx *privctx =
@@ -393,7 +379,6 @@ struct onak_dbctx *keydb_stacked_init(struct onak_db_config *dbcfg,
 		dbctx->getkeysigs = stacked_getkeysigs;
 		dbctx->cached_getkeysigs = stacked_cached_getkeysigs;
 		dbctx->keyid2uid = stacked_keyid2uid;
-		dbctx->getfullkeyid = stacked_getfullkeyid;
 		dbctx->iterate_keys = stacked_iterate_keys;
 	}