X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/5b3f77c7fbafb036d20a1577ed74f475e94ed821..59e5def499b3e9ae3587ebae2bef8794a1df34ea:/keydb_dynamic.c diff --git a/keydb_dynamic.c b/keydb_dynamic.c index 503f1bf..fa4b13b 100644 --- a/keydb_dynamic.c +++ b/keydb_dynamic.c @@ -23,7 +23,6 @@ #include "sendsync.h" static struct dbfuncs *loaded_backend = NULL; -static char *backendsoname; static void *backend_handle; static bool close_backend(void) @@ -45,6 +44,11 @@ static bool load_backend(void) loaded_backend = NULL; } + if (config.use_keyd) { + free(config.db_backend); + config.db_backend = strdup("keyd"); + } + if (!config.db_backend) { logthing(LOGTHING_CRITICAL, "No database backend defined."); exit(EXIT_FAILURE); @@ -105,8 +109,6 @@ static bool load_backend(void) static bool dynamic_starttrans() { - struct dynamic_backend *backend; - if (loaded_backend == NULL) { load_backend(); } @@ -122,8 +124,6 @@ static bool dynamic_starttrans() static void dynamic_endtrans() { - struct dynamic_backend *backend; - if (loaded_backend == NULL) { load_backend(); } @@ -138,8 +138,6 @@ static void dynamic_endtrans() static int dynamic_fetch_key(uint64_t keyid, struct openpgp_publickey **publickey, bool intrans) { - struct dynamic_backend *backend; - if (loaded_backend == NULL) { load_backend(); } @@ -156,8 +154,6 @@ static int dynamic_fetch_key(uint64_t keyid, static int dynamic_store_key(struct openpgp_publickey *publickey, bool intrans, bool update) { - struct dynamic_backend *backend; - if (loaded_backend == NULL) { load_backend(); } @@ -173,8 +169,6 @@ static int dynamic_store_key(struct openpgp_publickey *publickey, bool intrans, static int dynamic_delete_key(uint64_t keyid, bool intrans) { - struct dynamic_backend *backend; - if (loaded_backend == NULL) { load_backend(); } @@ -191,8 +185,6 @@ static int dynamic_delete_key(uint64_t keyid, bool intrans) static int dynamic_fetch_key_text(const char *search, struct openpgp_publickey **publickey) { - struct dynamic_backend *backend; - if (loaded_backend == NULL) { load_backend(); } @@ -209,8 +201,6 @@ static int dynamic_fetch_key_text(const char *search, static int dynamic_iterate_keys(void (*iterfunc)(void *ctx, struct openpgp_publickey *key), void *ctx) { - struct dynamic_backend *backend; - if (loaded_backend == NULL) { load_backend(); } @@ -234,7 +224,6 @@ static char *dynamic_keyid2uid(uint64_t keyid) struct openpgp_signedpacket_list *curuid = NULL; char buf[1024]; - struct dynamic_backend *backend; if (loaded_backend == NULL) { load_backend(); } @@ -281,7 +270,6 @@ static struct ll *dynamic_getkeysigs(uint64_t keyid, bool *revoked) struct openpgp_signedpacket_list *uids = NULL; struct openpgp_publickey *publickey = NULL; - struct dynamic_backend *backend; if ( loaded_backend == NULL ) { load_backend(); } @@ -321,8 +309,6 @@ static struct ll *dynamic_cached_getkeysigs(uint64_t keyid) struct stats_key *signedkey = NULL; struct ll *cursig = NULL; bool revoked = false; - - struct dynamic_backend *backend; if (keyid == 0) { return NULL; @@ -364,8 +350,7 @@ static struct ll *dynamic_cached_getkeysigs(uint64_t keyid) static uint64_t dynamic_getfullkeyid(uint64_t keyid) { struct openpgp_publickey *publickey = NULL; - struct dynamic_backend *backend; - + if (loaded_backend == NULL) { load_backend(); } @@ -406,7 +391,6 @@ static int dynamic_update_keys(struct openpgp_publickey **keys, bool sendsync) struct openpgp_publickey *curkey = NULL; struct openpgp_publickey *oldkey = NULL; struct openpgp_publickey *prev = NULL; - struct dynamic_backend *backend; int newkeys = 0; bool intrans; @@ -423,7 +407,7 @@ static int dynamic_update_keys(struct openpgp_publickey **keys, bool sendsync) for (curkey = *keys; curkey != NULL; curkey = curkey->next) { intrans = dynamic_starttrans(); logthing(LOGTHING_INFO, - "Fetching key 0x%llX, result: %d", + "Fetching key 0x%" PRIX64 ", result: %d", get_keyid(curkey), dynamic_fetch_key(get_keyid(curkey), &oldkey, intrans)); @@ -474,8 +458,6 @@ static int dynamic_update_keys(struct openpgp_publickey **keys, bool sendsync) static void dynamic_initdb(bool readonly) { - struct dynamic_backend *backend; - if (loaded_backend == NULL) { load_backend(); } @@ -489,8 +471,6 @@ static void dynamic_initdb(bool readonly) static void dynamic_cleanupdb(void) { - struct dynamic_backend *backend; - if (loaded_backend != NULL) { if (loaded_backend->cleanupdb != NULL) { loaded_backend->cleanupdb();