X-Git-Url: http://the.earth.li/gitweb/?a=blobdiff_plain;f=keydb_hkp.c;h=65b6bdcf4e22e1609f620aaa8356b16a0f0e3777;hb=cc7c85b31ad99e8ec2b545c333cbcc890a97e9e7;hp=0c6fd5a97f97f7eb50eecbe5a8d564430d3150e3;hpb=5cb3cfdb9d8caa6d7a4a1979c50c46896957b934;p=onak.git diff --git a/keydb_hkp.c b/keydb_hkp.c index 0c6fd5a..65b6bdc 100644 --- a/keydb_hkp.c +++ b/keydb_hkp.c @@ -34,6 +34,7 @@ #include "version.h" struct onak_hkp_dbctx { + struct onak_db_config *config; /* Our DB config info */ CURL *curl; char hkpbase[1024]; }; @@ -346,7 +347,7 @@ static void hkp_cleanupdb(struct onak_dbctx *dbctx) * * We initialize CURL here. */ -struct onak_dbctx *keydb_hkp_init(bool readonly) +struct onak_dbctx *keydb_hkp_init(struct onak_db_config *dbcfg, bool readonly) { struct onak_dbctx *dbctx; struct onak_hkp_dbctx *privctx; @@ -357,6 +358,7 @@ struct onak_dbctx *keydb_hkp_init(bool readonly) return NULL; } + dbctx->config = dbcfg; dbctx->priv = privctx = malloc(sizeof(*privctx)); dbctx->cleanupdb = hkp_cleanupdb; dbctx->starttrans = hkp_starttrans; @@ -373,9 +375,11 @@ struct onak_dbctx *keydb_hkp_init(bool readonly) dbctx->getfullkeyid = generic_getfullkeyid; dbctx->iterate_keys = hkp_iterate_keys; - if (!hkp_parse_url(privctx, config.db_dir)) { + if (!hkp_parse_url(privctx, dbcfg->location)) { exit(EXIT_FAILURE); } + logthing(LOGTHING_INFO, "Using %s as HKP forwarding URL.", + privctx->hkpbase); curl_global_init(CURL_GLOBAL_DEFAULT); privctx->curl = curl_easy_init(); if (privctx->curl == NULL) {