X-Git-Url: https://the.earth.li/gitweb/?a=blobdiff_plain;ds=inline;f=keydb_file.c;h=bc3c578667a0a36e205b69567ea3e2dd953f43e2;hb=357fbc65bfab230bbf12313e8b458d8325a6174f;hp=e0ed610e33cd7b976df43c01d9e5e8a216816fe9;hpb=8e0907be1d73011075a99a0c029c56664e12843e;p=onak.git
diff --git a/keydb_file.c b/keydb_file.c
index e0ed610..bc3c578 100644
--- a/keydb_file.c
+++ b/keydb_file.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
@@ -22,6 +21,8 @@
#include
#include
#include
+#include
+#include
#include
#include
#include
@@ -31,9 +32,9 @@
#include "keydb.h"
#include "keyid.h"
#include "keystructs.h"
-#include "ll.h"
#include "log.h"
#include "mem.h"
+#include "onak.h"
#include "onak-conf.h"
#include "parsekey.h"
@@ -270,7 +271,7 @@ static void file_cleanupdb(struct onak_dbctx *dbctx)
*
* This is just a no-op for flat file access.
*/
-struct onak_dbctx *keydb_file_init(bool readonly)
+struct onak_dbctx *keydb_file_init(struct onak_db_config *dbcfg, bool readonly)
{
struct onak_dbctx *dbctx;
@@ -279,7 +280,8 @@ struct onak_dbctx *keydb_file_init(bool readonly)
return NULL;
}
- dbctx->priv = strdup(config.db_dir);
+ dbctx->config = dbcfg;
+ dbctx->priv = strdup(dbcfg->location);
dbctx->cleanupdb = file_cleanupdb;
dbctx->starttrans = file_starttrans;