X-Git-Url: https://the.earth.li/gitweb/?a=blobdiff_plain;f=keydb_dynamic.c;h=b302efbb0c4a0e6d2a2b0c5947d31195d8060de1;hb=5cb163e87c7f0717aa94ca281a56e572c2a6c8f3;hp=25a359aa9ecb548b2d25159c6ac474a5c623c543;hpb=1ec1e2efdf4092233ac2136dff5a35cf6c7f4710;p=onak.git
diff --git a/keydb_dynamic.c b/keydb_dynamic.c
index 25a359a..b302efb 100644
--- a/keydb_dynamic.c
+++ b/keydb_dynamic.c
@@ -13,8 +13,7 @@
* more details.
*
* You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * this program. If not, see .
*/
#include
@@ -109,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,
@@ -292,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;