X-Git-Url: http://the.earth.li/gitweb/?a=blobdiff_plain;f=keydb_pg.c;h=e87d4f85d3c93bf51190aae44b382eae3e794970;hb=refs%2Ftags%2Fonak-0.5.0;hp=ca7e35bac0545796f4fe32c768a4b47af2ec78d0;hpb=8e0907be1d73011075a99a0c029c56664e12843e;p=onak.git diff --git a/keydb_pg.c b/keydb_pg.c index ca7e35b..e87d4f8 100644 --- a/keydb_pg.c +++ b/keydb_pg.c @@ -666,7 +666,7 @@ static void pg_cleanupdb(struct onak_dbctx *dbctx) * this file are called in order to allow the DB to be initialized ready * for access. */ -struct onak_dbctx *keydb_pg_init(bool readonly) +struct onak_dbctx *keydb_pg_init(struct onak_db_config *dbcfg, bool readonly) { struct onak_dbctx *dbctx; PGconn *dbconn; @@ -675,14 +675,15 @@ struct onak_dbctx *keydb_pg_init(bool readonly) if (dbctx == NULL) { return NULL; } + dbctx->config = dbcfg; - dbconn = PQsetdbLogin(config.pg_dbhost, // host + dbconn = PQsetdbLogin(dbcfg->hostname, // host NULL, // port NULL, // options NULL, // tty - config.pg_dbname, // database - config.pg_dbuser, //login - config.pg_dbpass); // password + dbcfg->location, // database + dbcfg->username, //login + dbcfg->password); // password if (PQstatus(dbconn) == CONNECTION_BAD) { logthing(LOGTHING_CRITICAL, "Connection to database failed.");