Cleanup postinst to avoid recursive chown of database

[onak.git] / keydb_fs.c

diff --git a/keydb_fs.c b/keydb_fs.c
index 86da08e59b8807d184fa8af2a5c1b1165c753754..f8d55dc8233dd80a2b92e6878abee3719dc67cd0 100644 (file)
--- a/keydb_fs.c
+++ b/keydb_fs.c
@@ -379,8 +379,13 @@ static int fs_store_key(struct onak_dbctx *dbctx,
                }
 
                get_skshash(publickey, &hash);
-               hashid = (hash.hash[0] << 24) + (hash.hash[1] << 16) +
-                               (hash.hash[2] << 8) + hash.hash[3];
+               hashid = hash.hash[0];
+               hashid <<= 8;
+               hashid |= hash.hash[1];
+               hashid <<= 8;
+               hashid |= hash.hash[2];
+               hashid <<= 8;
+               hashid |= hash.hash[3];
                prove_path_to(hashid, "skshash", dbctx->config->location);
                skshashpath(wbuffer, sizeof(wbuffer), &hash,
                        dbctx->config->location);
@@ -435,6 +440,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 +470,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 +645,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);
 }
 
 /**