X-Git-Url: https://the.earth.li/gitweb/?a=blobdiff_plain;f=keydb_dynamic.c;h=b302efbb0c4a0e6d2a2b0c5947d31195d8060de1;hb=5cb163e87c7f0717aa94ca281a56e572c2a6c8f3;hp=9e4e3bcb7585e27decf07aa2a8ca22905d0a0573;hpb=6df51fef2960f533a741fb7290867387ed3fbba5;p=onak.git diff --git a/keydb_dynamic.c b/keydb_dynamic.c index 9e4e3bc..b302efb 100644 --- a/keydb_dynamic.c +++ b/keydb_dynamic.c @@ -108,14 +108,15 @@ 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, @@ -291,11 +292,20 @@ struct onak_dbctx *keydb_dynamic_init(struct onak_db_config *dbcfg, soname = NULL; exit(EXIT_FAILURE); } - free(soname); - soname = NULL; privctx->loadeddbctx = backend_init(dbcfg, readonly); + if (privctx->loadeddbctx == NULL) { + logthing(LOGTHING_CRITICAL, + "Failed to initialise dynamic backend: %s", + soname); + free(soname); + soname = NULL; + exit(EXIT_FAILURE); + } + free(soname); + soname = NULL; + if (privctx->loadeddbctx != NULL) { dbctx->cleanupdb = dynamic_cleanupdb; dbctx->starttrans = dynamic_starttrans;