X-Git-Url: https://the.earth.li/gitweb/?a=blobdiff_plain;f=keydb_fs.c;h=aabb616e7efcd9e3dd82ab567708e8b31e7fb5a8;hb=f869498b2b159bd3d363fb2f9d803b99c44de8bc;hp=78e240cdae6c2f86b8dd7a830849d629269b21e7;hpb=0c120d1895d25b59abe338862189be1b87447569;p=onak.git
diff --git a/keydb_fs.c b/keydb_fs.c
index 78e240c..aabb616 100644
--- a/keydb_fs.c
+++ b/keydb_fs.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
@@ -395,10 +394,11 @@ static int fs_store_key(struct onak_dbctx *dbctx,
/**
* delete_key - Given a keyid delete the key from storage.
- * @keyid: The keyid to delete.
+ * @fp: The fingerprint of the key to delete.
* @intrans: If we're already in a transaction.
*/
-static int fs_delete_key(struct onak_dbctx *dbctx, uint64_t keyid, bool intrans)
+static int fs_delete_key(struct onak_dbctx *dbctx,
+ struct openpgp_fingerprint *fp, bool intrans)
{
static char buffer[PATH_MAX];
int ret;
@@ -408,9 +408,11 @@ static int fs_delete_key(struct onak_dbctx *dbctx, uint64_t keyid, bool intrans)
struct openpgp_fingerprint *subkeyids = NULL;
uint64_t subkeyid;
int i = 0;
+ uint64_t keyid;
- if ((keyid >> 32) == 0)
- keyid = fs_getfullkeyid(dbctx, keyid);
+ keyid = fingerprint2keyid(fp);
+ if (keyid == 0)
+ return 1;
if (!intrans)
fs_starttrans(dbctx);
@@ -433,6 +435,8 @@ static int fs_delete_key(struct onak_dbctx *dbctx, uint64_t keyid, bool intrans)
wl = wl->next;
}
+ llfree(wordlist, free);
+ wordlist = NULL;
subkeyids = keysubkeys(pk);
i = 0;
@@ -461,6 +465,8 @@ static int fs_delete_key(struct onak_dbctx *dbctx, uint64_t keyid, bool intrans)
keypath(buffer, sizeof(buffer), keyid, dbctx->config->location);
unlink(buffer);
+ free_publickey(pk);
+
if (!intrans)
fs_endtrans(dbctx);
return 1;
@@ -634,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);
}
/**
@@ -704,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;