X-Git-Url: https://the.earth.li/gitweb/?a=blobdiff_plain;f=keydb_fs.c;h=aabb616e7efcd9e3dd82ab567708e8b31e7fb5a8;hb=a94e29c9a3763f96b1c773f0818b97e4fd0777b0;hp=926960f04cbe9a2f7aec564f094e2d26201d05d2;hpb=5cb163e87c7f0717aa94ca281a56e572c2a6c8f3;p=onak.git

diff --git a/keydb_fs.c b/keydb_fs.c
index 926960f..aabb616 100644
--- a/keydb_fs.c
+++ b/keydb_fs.c
@@ -435,6 +435,8 @@ static int fs_delete_key(struct onak_dbctx *dbctx,
 
 			wl = wl->next;
 		}
+		llfree(wordlist, free);
+		wordlist = NULL;
 
 		subkeyids = keysubkeys(pk);
 		i = 0;
@@ -463,6 +465,8 @@ static int fs_delete_key(struct onak_dbctx *dbctx,
 	keypath(buffer, sizeof(buffer), keyid, dbctx->config->location);
 	unlink(buffer);
 
+	free_publickey(pk);
+
 	if (!intrans)
 		fs_endtrans(dbctx);
 	return 1;
@@ -636,6 +640,10 @@ static void fs_cleanupdb(struct onak_dbctx *dbctx)
 
 	/* Mmmm nothing to do here? */
 	close(privctx->lockfile_fd);
+
+	free(privctx);
+	dbctx->priv = NULL;
+	free(dbctx);
 }
 
 /**
@@ -706,7 +714,6 @@ struct onak_dbctx *keydb_fs_init(struct onak_db_config *dbcfg, bool readonly)
 	dbctx->getkeysigs		= generic_getkeysigs;
 	dbctx->cached_getkeysigs	= generic_cached_getkeysigs;
 	dbctx->keyid2uid		= generic_keyid2uid;
-	dbctx->getfullkeyid		= fs_getfullkeyid;
 	dbctx->iterate_keys		= fs_iterate_keys;
 
 	return dbctx;