X-Git-Url: https://the.earth.li/gitweb/?a=blobdiff_plain;f=keydb_dynamic.c;h=385c09cbb5ef3600e2b9e9a59a79b61d423f4c03;hb=c3fe49f62ac8d87e4e0ac836891792e9c10035a2;hp=ef42fbe35406977deb152610eceab0032bda850c;hpb=1a9c2d7545a4bafd7a601a8983192c4861d89c68;p=onak.git diff --git a/keydb_dynamic.c b/keydb_dynamic.c index ef42fbe..385c09c 100644 --- a/keydb_dynamic.c +++ b/keydb_dynamic.c @@ -108,24 +108,28 @@ static int dynamic_store_key(struct onak_dbctx *dbctx, publickey, intrans, update); } -static int dynamic_delete_key(struct onak_dbctx *dbctx, uint64_t keyid, +static int dynamic_delete_key(struct onak_dbctx *dbctx, + struct openpgp_fingerprint *fp, bool intrans) { struct onak_dynamic_dbctx *privctx = (struct onak_dynamic_dbctx *) dbctx->priv; return privctx->loadeddbctx->delete_key(privctx->loadeddbctx, - keyid, intrans); + fp, intrans); } static int dynamic_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_dynamic_dbctx *privctx = (struct onak_dynamic_dbctx *) dbctx->priv; return privctx->loadeddbctx->update_keys(privctx->loadeddbctx, - keys, sendsync); + keys, blacklist, updateonly, sendsync); } static struct ll *dynamic_getkeysigs(struct onak_dbctx *dbctx, @@ -158,15 +162,6 @@ static char *dynamic_keyid2uid(struct onak_dbctx *dbctx, keyid); } -static uint64_t dynamic_getfullkeyid(struct onak_dbctx *dbctx, - uint64_t keyid) -{ - struct onak_dynamic_dbctx *privctx = - (struct onak_dynamic_dbctx *) dbctx->priv; - - return privctx->loadeddbctx->getfullkeyid(privctx->loadeddbctx, keyid); -} - static int dynamic_iterate_keys(struct onak_dbctx *dbctx, void (*iterfunc)(void *ctx, struct openpgp_publickey *key), void *ctx) @@ -319,7 +314,6 @@ struct onak_dbctx *keydb_dynamic_init(struct onak_db_config *dbcfg, dbctx->getkeysigs = dynamic_getkeysigs; dbctx->cached_getkeysigs = dynamic_cached_getkeysigs; dbctx->keyid2uid = dynamic_keyid2uid; - dbctx->getfullkeyid = dynamic_getfullkeyid; dbctx->iterate_keys = dynamic_iterate_keys; }