X-Git-Url: http://the.earth.li/gitweb/?a=blobdiff_plain;f=keydb_db4.c;h=6a21fab73678a811a286eeff35a6d3d7e97f2351;hb=ec3fd8971e87c82b2768b5b9dcbcd569edc3259b;hp=1596e5b97f4c7f60167eebd1318c8322f130e4aa;hpb=404bc09a23d44a088ed4970975924469947cb4d5;p=onak.git

diff --git a/keydb_db4.c b/keydb_db4.c
index 1596e5b..6a21fab 100644
--- a/keydb_db4.c
+++ b/keydb_db4.c
@@ -1,12 +1,24 @@
 /*
  * keydb_db4.c - Routines to store and fetch keys in a DB4 database.
  *
- * Jonathan McDowell <noodles@earth.li>
+ * Copyright 2002-2008 Jonathan McDowell <noodles@earth.li>
  *
- * Copyright 2002-2004 Project Purple
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * 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.
  */
 
 #include <sys/types.h>
+#include <sys/stat.h>
 #include <sys/uio.h>
 #include <ctype.h>
 #include <errno.h>
@@ -30,308 +42,271 @@
 #include "parsekey.h"
 #include "wordlist.h"
 
-/**
- *	dbenv - our database environment.
- */
-static DB_ENV *dbenv = NULL;
+#define DB4_UPGRADE_FILE "db_upgrade.lck"
 
-/**
- *	numdb - The number of database files we have.
- */
-static int numdbs = 16;
+struct onak_db4_dbctx {
+	DB_ENV *dbenv;	/* The database environment context */
+	int numdbs;	/* Number of data databases in use */
+	DB **dbconns;	/* Connections to the key data databases */
+	DB *worddb;	/* Connection to the word lookup database */
+	DB *id32db;	/* Connection to the 32 bit ID lookup database */
+	DB *skshashdb;	/* Connection to the SKS hash database */
+	DB *subkeydb;	/* Connection to the subkey ID lookup database */
+	DB_TXN *txn;	/* Our current transaction ID */
+};
 
-/**
- *	dbconn - our connections to the key database files.
- */
-static DB **dbconns = NULL;
+DB *keydb(struct onak_db4_dbctx *privctx, uint64_t keyid)
+{
+	uint64_t keytrun;
 
-/**
- *	worddb - our connection to the word database.
- */
-static DB *worddb = NULL;
+	keytrun = keyid >> 8;
 
-/**
- *	id32db - our connection to the 32bit ID database.
- */
-static DB *id32db = NULL;
+	return(privctx->dbconns[keytrun % privctx->numdbs]);
+}
 
 /**
- *	txn - our current transaction id.
+ *	db4_errfunc - Direct DB errors to logfile
+ *
+ *	Basic function to take errors from the DB library and output them to
+ *	the logfile rather than stderr.
  */
-static DB_TXN *txn = NULL;
-
-DB *keydb(uint64_t keyid)
+#if (DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR < 3)
+static void db4_errfunc(const char *errpfx, const char *errmsg)
+#else
+static void db4_errfunc(const DB_ENV *edbenv, const char *errpfx,
+		const char *errmsg)
+#endif
 {
-	uint64_t keytrun;
-
-	keytrun = keyid >> 8;
+	if (errpfx) {
+		logthing(LOGTHING_DEBUG, "db4 error: %s:%s", errpfx, errmsg);
+	} else {
+		logthing(LOGTHING_DEBUG, "db4 error: %s", errmsg);
+	}
 
-	return(dbconns[keytrun % numdbs]);
+	return;
 }
 
 /**
- *	initdb - Initialize the key database.
+ *	starttrans - Start a transaction.
  *
- *	This function should be called before any of the other functions in
- *	this file are called in order to allow the DB to be initialized ready
- *	for access.
+ *	Start a transaction. Intended to be used if we're about to perform many
+ *	operations on the database to help speed it all up, or if we want
+ *	something to only succeed if all relevant operations are successful.
  */
-void initdb(bool readonly)
+static bool db4_starttrans(struct onak_dbctx *dbctx)
 {
-	char       buf[1024];
-	FILE      *numdb = NULL;
-	int        ret = 0;
-	int        i = 0;
-	u_int32_t  flags = 0;
+	struct onak_db4_dbctx *privctx = (struct onak_db4_dbctx *) dbctx->priv;
+	int ret;
 
-	snprintf(buf, sizeof(buf) - 1, "%s/num_keydb", config.db_dir);
-	numdb = fopen(buf, "r");
-	if (numdb != NULL) {
-		if (fgets(buf, sizeof(buf), numdb) != NULL) {
-			numdbs = atoi(buf);
-		}
-		fclose(numdb);
-	} else if (!readonly) {
-		logthing(LOGTHING_ERROR, "Couldn't open num_keydb: %s",
-				strerror(errno));
-		numdb = fopen(buf, "w");
-		if (numdb != NULL) {
-			fprintf(numdb, "%d", numdbs);
-			fclose(numdb);
-		} else {
-			logthing(LOGTHING_ERROR,
-				"Couldn't write num_keydb: %s",
-				strerror(errno));
-		}
-	}
+	log_assert(privctx->dbenv != NULL);
+	log_assert(privctx->txn == NULL);
 
-	dbconns = malloc(sizeof (DB *) * numdbs);
-	if (dbconns == NULL) {
+	ret = privctx->dbenv->txn_begin(privctx->dbenv,
+		NULL, /* No parent transaction */
+		&privctx->txn,
+		0);
+	if (ret != 0) {
 		logthing(LOGTHING_CRITICAL,
-				"Couldn't allocate memory for dbconns");
-		ret = 1;
+				"Error starting transaction: %s",
+				db_strerror(ret));
+		exit(1);
 	}
 
-	if (ret == 0) {
-		ret = db_env_create(&dbenv, 0);
-		if (ret != 0) {
-			logthing(LOGTHING_CRITICAL,
-				"db_env_create: %s", db_strerror(ret));
-		}
-	}
+	return true;
+}
 
-	/*
-	 * Enable deadlock detection so that we don't block indefinitely on
-	 * anything. What we really want is simple 2 state locks, but I'm not
-	 * sure how to make the standard DB functions do that yet.
-	 */
-	if (ret == 0) {
-		ret = dbenv->set_lk_detect(dbenv, DB_LOCK_DEFAULT);
-		if (ret != 0) {
-			logthing(LOGTHING_CRITICAL,
-				"db_env_create: %s", db_strerror(ret));
-		}
-	}
+/**
+ *	endtrans - End a transaction.
+ *
+ *	Ends a transaction.
+ */
+static void db4_endtrans(struct onak_dbctx *dbctx)
+{
+	struct onak_db4_dbctx *privctx = (struct onak_db4_dbctx *) dbctx->priv;
+	int ret;
 
-	if (ret == 0) {
-		ret = dbenv->open(dbenv, config.db_dir,
-				DB_INIT_LOG | DB_INIT_MPOOL | DB_INIT_LOCK |
-				DB_INIT_TXN |
-				DB_CREATE,
-				0);
-		if (ret != 0) {
-			logthing(LOGTHING_CRITICAL,
-					"Error opening db environment: %s (%s)",
-					config.db_dir,
-					db_strerror(ret));
-		}
-	}
+	log_assert(privctx->dbenv != NULL);
+	log_assert(privctx->txn != NULL);
 
-	if (ret == 0) {
-		starttrans();
+	ret = privctx->txn->commit(privctx->txn,
+		0);
+	if (ret != 0) {
+		logthing(LOGTHING_CRITICAL,
+				"Error ending transaction: %s",
+				db_strerror(ret));
+		exit(1);
+	}
+	privctx->txn = NULL;
 
-		for (i = 0; !ret && i < numdbs; i++) {
-			ret = db_create(&dbconns[i], dbenv, 0);
-			if (ret != 0) {
-				logthing(LOGTHING_CRITICAL,
-					"db_create: %s", db_strerror(ret));
-			}
+	return;
+}
 
-			if (ret == 0) {
-				snprintf(buf, 1023, "keydb.%d.db", i);
-				flags = DB_CREATE;
-				if (readonly) {
-					flags = DB_RDONLY;
-				}
-				ret = dbconns[i]->open(dbconns[i],
-						txn,
-						buf,
-						"keydb",
-						DB_HASH,
-						flags,
-						0664);
-				if (ret != 0) {
-					logthing(LOGTHING_CRITICAL,
-						"Error opening key database:"
-						" %s (%s)",
-						buf,
-						db_strerror(ret));
-				}
-			}
+/**
+ *	db4_upgradedb - Upgrade a DB4 database
+ *
+ *	Called if we discover we need to upgrade our DB4 database; ie if
+ *	we're running with a newer version of db4 than the database was
+ *	created with.
+ */
+static int db4_upgradedb(struct onak_db4_dbctx *privctx)
+{
+	DB *curdb = NULL;
+	int ret;
+	int i;
+	char buf[1024];
+	int lockfile_fd;
+	struct stat statbuf;
+
+	snprintf(buf, sizeof(buf) - 1, "%s/%s", config.db_dir,
+			DB4_UPGRADE_FILE);
+	lockfile_fd = open(buf, O_RDWR | O_CREAT | O_EXCL, 0600);
+	if (lockfile_fd < 0) {
+		if (errno == EEXIST) {
+			while (stat(buf, &statbuf) == 0) ;
+			return 0;
+		} else {
+			logthing(LOGTHING_CRITICAL, "Couldn't open database "
+				"update lock file: %s", strerror(errno));
+			return -1;
 		}
-
 	}
+	snprintf(buf, sizeof(buf) - 1, "%d", getpid());
+	write(lockfile_fd, buf, strlen(buf));
+	close(lockfile_fd);
 
+	logthing(LOGTHING_NOTICE, "Upgrading DB4 database");
+	ret = db_env_create(&privctx->dbenv, 0);
 	if (ret == 0) {
-		ret = db_create(&worddb, dbenv, 0);
-		if (ret != 0) {
-			logthing(LOGTHING_CRITICAL, "db_create: %s",
-					db_strerror(ret));
-		}
+		privctx->dbenv->set_errcall(privctx->dbenv, &db4_errfunc);
+		privctx->dbenv->remove(privctx->dbenv, config.db_dir, 0);
+		privctx->dbenv = NULL;
 	}
-
-	if (ret == 0) {
-		ret = worddb->set_flags(worddb, DB_DUP);
+	for (i = 0; i < privctx->numdbs; i++) {
+		ret = db_create(&curdb, NULL, 0);
+		if (ret == 0) {
+			snprintf(buf, sizeof(buf) - 1, "%s/keydb.%d.db",
+				config.db_dir, i);
+			logthing(LOGTHING_DEBUG, "Upgrading %s", buf);
+			curdb->upgrade(curdb, buf, 0);
+			curdb->close(curdb, 0);
+		} else {
+			logthing(LOGTHING_ERROR, "Error upgrading DB %s : %s",
+				buf,
+				db_strerror(ret));
+		}
 	}
 
+	ret = db_create(&curdb, NULL, 0);
 	if (ret == 0) {
-		ret = worddb->open(worddb, txn, "worddb", "worddb", DB_BTREE,
-				flags,
-				0664);
-		if (ret != 0) {
-			logthing(LOGTHING_CRITICAL,
-					"Error opening word database: %s (%s)",
-					"worddb",
-					db_strerror(ret));
-		}
+		snprintf(buf, sizeof(buf) - 1, "%s/worddb", config.db_dir);
+		logthing(LOGTHING_DEBUG, "Upgrading %s", buf);
+		curdb->upgrade(curdb, buf, 0);
+		curdb->close(curdb, 0);
+	} else {
+		logthing(LOGTHING_ERROR, "Error upgrading DB %s : %s",
+			buf,
+			db_strerror(ret));
 	}
 
+	ret = db_create(&curdb, NULL, 0);
 	if (ret == 0) {
-		ret = db_create(&id32db, dbenv, 0);
-		if (ret != 0) {
-			logthing(LOGTHING_CRITICAL, "db_create: %s",
-					db_strerror(ret));
-		}
+		snprintf(buf, sizeof(buf) - 1, "%s/id32db", config.db_dir);
+		logthing(LOGTHING_DEBUG, "Upgrading %s", buf);
+		curdb->upgrade(curdb, buf, 0);
+		curdb->close(curdb, 0);
+	} else {
+		logthing(LOGTHING_ERROR, "Error upgrading DB %s : %s",
+			buf,
+			db_strerror(ret));
 	}
 
+	ret = db_create(&curdb, NULL, 0);
 	if (ret == 0) {
-		ret = id32db->set_flags(id32db, DB_DUP);
+		snprintf(buf, sizeof(buf) - 1, "%s/skshashdb", config.db_dir);
+		logthing(LOGTHING_DEBUG, "Upgrading %s", buf);
+		curdb->upgrade(curdb, buf, 0);
+		curdb->close(curdb, 0);
+	} else {
+		logthing(LOGTHING_ERROR, "Error upgrading DB %s : %s",
+			buf,
+			db_strerror(ret));
 	}
 
+	ret = db_create(&curdb, NULL, 0);
 	if (ret == 0) {
-		ret = id32db->open(id32db, txn, "id32db", "id32db", DB_HASH,
-				flags,
-				0664);
-		if (ret != 0) {
-			logthing(LOGTHING_CRITICAL,
-					"Error opening id32 database: %s (%s)",
-					"id32db",
-					db_strerror(ret));
-		}
+		snprintf(buf, sizeof(buf) - 1, "%s/subkeydb", config.db_dir);
+		logthing(LOGTHING_DEBUG, "Upgrading %s", buf);
+		curdb->upgrade(curdb, buf, 0);
+		curdb->close(curdb, 0);
+	} else {
+		logthing(LOGTHING_ERROR, "Error upgrading DB %s : %s",
+			buf,
+			db_strerror(ret));
 	}
 
-	if (txn != NULL) {
-		endtrans();
-	}
+	snprintf(buf, sizeof(buf) - 1, "%s/%s", config.db_dir,
+			DB4_UPGRADE_FILE);
+	unlink(buf);
 
-	if (ret != 0) {
-		cleanupdb();
-		logthing(LOGTHING_CRITICAL,
-				"Error opening database; exiting");
-		exit(EXIT_FAILURE);
-	}
-	
-	return;
+	return ret;
 }
 
 /**
- *	cleanupdb - De-initialize the key database.
+ *	getfullkeyid - Maps a 32bit key id to a 64bit one.
+ *	@keyid: The 32bit keyid.
  *
- *	This function should be called upon program exit to allow the DB to
- *	cleanup after itself.
+ *	This function maps a 32bit key id to the full 64bit one. It returns the
+ *	full keyid. If the key isn't found a keyid of 0 is returned.
  */
-void cleanupdb(void)
+static uint64_t db4_getfullkeyid(struct onak_dbctx *dbctx, uint64_t keyid)
 {
-	int i = 0;
+	struct onak_db4_dbctx *privctx = (struct onak_db4_dbctx *) dbctx->priv;
+	DBT       key, data;
+	DBC      *cursor = NULL;
+	uint32_t  shortkeyid = 0;
+	int       ret = 0;
 
-	if (dbenv != NULL) {
-		dbenv->txn_checkpoint(dbenv, 0, 0, 0);
-		if (id32db != NULL) {
-			id32db->close(id32db, 0);
-			id32db = NULL;
-		}
-		if (worddb != NULL) {
-			worddb->close(worddb, 0);
-			worddb = NULL;
-		}
-		for (i = 0; i < numdbs; i++) {
-			if (dbconns[i] != NULL) {
-				dbconns[i]->close(dbconns[i], 0);
-				dbconns[i] = NULL;
-			}
-		}
-		free(dbconns);
-		dbconns = NULL;
-		dbenv->close(dbenv, 0);
-		dbenv = NULL;
-	}
-}
+	if (keyid < 0x100000000LL) {
+		ret = privctx->id32db->cursor(privctx->id32db,
+				privctx->txn,
+				&cursor,
+				0);   /* flags */
 
-/**
- *	starttrans - Start a transaction.
- *
- *	Start a transaction. Intended to be used if we're about to perform many
- *	operations on the database to help speed it all up, or if we want
- *	something to only succeed if all relevant operations are successful.
- */
-bool starttrans(void)
-{
-	int ret;
+		if (ret != 0) {
+			return 0;
+		}
 
-	log_assert(dbenv != NULL);
-	log_assert(txn == NULL);
+		shortkeyid = keyid & 0xFFFFFFFF;
 
-	ret = dbenv->txn_begin(dbenv,
-		NULL, /* No parent transaction */
-		&txn,
-		0);
-	if (ret != 0) {
-		logthing(LOGTHING_CRITICAL,
-				"Error starting transaction: %s",
-				db_strerror(ret));
-		exit(1);
-	}
+		memset(&key, 0, sizeof(key));
+		memset(&data, 0, sizeof(data));
+		key.data = &shortkeyid;
+		key.size = sizeof(shortkeyid);
+		data.flags = DB_DBT_MALLOC;
 
-	return true;
-}
+		ret = cursor->c_get(cursor,
+			&key,
+			&data,
+			DB_SET);
 
-/**
- *	endtrans - End a transaction.
- *
- *	Ends a transaction.
- */
-void endtrans(void)
-{
-	int ret;
+		if (ret == 0) {
+			keyid = *(uint64_t *) data.data;
 
-	log_assert(dbenv != NULL);
-	log_assert(txn != NULL);
+			if (data.data != NULL) {
+				free(data.data);
+				data.data = NULL;
+			}
+		}
 
-	ret = txn->commit(txn,
-		0);
-	if (ret != 0) {
-		logthing(LOGTHING_CRITICAL,
-				"Error ending transaction: %s",
-				db_strerror(ret));
-		exit(1);
+		cursor->c_close(cursor);
+		cursor = NULL;
 	}
-	txn = NULL;
 
-	return;
+	return keyid;
 }
 
 /**
- *	fetch_key - Given a keyid fetch the key from storage.
+ *	fetch_key_id - Given a keyid fetch the key from storage.
  *	@keyid: The keyid to fetch.
  *	@publickey: A pointer to a structure to return the key in.
  *	@intrans: If we're already in a transaction.
@@ -342,9 +317,11 @@ void endtrans(void)
  *	in and then parse_keys() to parse the packets into a publickey
  *	structure.
  */
-int fetch_key(uint64_t keyid, struct openpgp_publickey **publickey,
+static int db4_fetch_key_id(struct onak_dbctx *dbctx, uint64_t keyid,
+		struct openpgp_publickey **publickey,
 		bool intrans)
 {
+	struct onak_db4_dbctx *privctx = (struct onak_db4_dbctx *) dbctx->priv;
 	struct openpgp_packet_list *packets = NULL;
 	DBT key, data;
 	int ret = 0;
@@ -352,7 +329,7 @@ int fetch_key(uint64_t keyid, struct openpgp_publickey **publickey,
 	struct buffer_ctx fetchbuf;
 
 	if (keyid < 0x100000000LL) {
-		keyid = getfullkeyid(keyid);
+		keyid = db4_getfullkeyid(dbctx, keyid);
 	}
 
 	memset(&key, 0, sizeof(key));
@@ -365,18 +342,52 @@ int fetch_key(uint64_t keyid, struct openpgp_publickey **publickey,
 	key.data = &keyid;
 
 	if (!intrans) {
-		starttrans();
+		db4_starttrans(dbctx);
 	}
 
-	ret = keydb(keyid)->get(keydb(keyid),
-			txn,
+	ret = keydb(privctx, keyid)->get(keydb(privctx, keyid),
+			privctx->txn,
 			&key,
 			&data,
 			0); /* flags*/
-	
-	if (ret == 0) {
-		fetchbuf.buffer = data.data;
-		fetchbuf.offset = 0;
+
+	if (ret == DB_NOTFOUND) {
+		/* If we didn't find the key ID see if it's a subkey ID */
+		memset(&key, 0, sizeof(key));
+		memset(&data, 0, sizeof(data));
+		data.size = 0;
+		data.data = NULL;
+		key.size = sizeof(keyid);
+		key.data = &keyid;
+
+		ret = privctx->subkeydb->get(privctx->subkeydb,
+			privctx->txn,
+			&key,
+			&data,
+			0); /* flags*/
+
+		if (ret == 0) {
+			/* We got a subkey match; retrieve the actual key */
+			keyid = *(uint64_t *) data.data;
+
+			memset(&key, 0, sizeof(key));
+			memset(&data, 0, sizeof(data));
+			data.size = 0;
+			data.data = NULL;
+			key.size = sizeof(keyid);
+			key.data = &keyid;
+
+			ret = keydb(privctx, keyid)->get(keydb(privctx, keyid),
+				privctx->txn,
+				&key,
+				&data,
+				0); /* flags*/
+		}
+	}
+
+	if (ret == 0) {
+		fetchbuf.buffer = data.data;
+		fetchbuf.offset = 0;
 		fetchbuf.size = data.size;
 		read_openpgp_stream(buffer_fetchchar, &fetchbuf,
 				&packets, 0);
@@ -391,7 +402,7 @@ int fetch_key(uint64_t keyid, struct openpgp_publickey **publickey,
 	}
 
 	if (!intrans) {
-		endtrans();
+		db4_endtrans(dbctx);
 	}
 
 	return (numkeys);
@@ -410,8 +421,10 @@ int worddb_cmp(const void *d1, const void *d2)
  *	This function searches for the supplied text and returns the keys that
  *	contain it.
  */
-int fetch_key_text(const char *search, struct openpgp_publickey **publickey)
+static int db4_fetch_key_text(struct onak_dbctx *dbctx, const char *search,
+		struct openpgp_publickey **publickey)
 {
+	struct onak_db4_dbctx *privctx = (struct onak_db4_dbctx *) dbctx->priv;
 	DBC *cursor = NULL;
 	DBT key, data;
 	int ret;
@@ -423,19 +436,25 @@ int fetch_key_text(const char *search, struct openpgp_publickey **publickey)
 	struct ll *curword = NULL;
 	struct keyarray keylist = { NULL, 0, 0 };
 	struct keyarray newkeylist = { NULL, 0, 0 };
+	int firstpass = 1;
 
 	numkeys = 0;
 	searchtext = strdup(search);
 	wordlist = makewordlist(wordlist, searchtext);
 
 	for (curword = wordlist; curword != NULL; curword = curword->next) {
-		starttrans();
+		db4_starttrans(dbctx);
 
-		ret = worddb->cursor(worddb,
-				txn,
+		ret = privctx->worddb->cursor(privctx->worddb,
+				privctx->txn,
 				&cursor,
 				0);   /* flags */
 
+		if (ret != 0) {
+			db4_endtrans(dbctx);
+			break;
+		}
+
 		memset(&key, 0, sizeof(key));
 		memset(&data, 0, sizeof(data));
 		key.data = curword->object;
@@ -455,8 +474,12 @@ int fetch_key_text(const char *search, struct openpgp_publickey **publickey)
 						data.data)[i];
 			}
 
-			if (keylist.count == 0 ||
-					array_find(&keylist, keyid)) {
+			/*
+			 * Only add the keys containing this word if this is
+			 * our first pass (ie we have no existing key list),
+			 * or the key contained a previous word.
+			 */
+			if (firstpass || array_find(&keylist, keyid)) {
 				array_add(&newkeylist, keyid);
 			}
 
@@ -476,16 +499,21 @@ int fetch_key_text(const char *search, struct openpgp_publickey **publickey)
 			free(data.data);
 			data.data = NULL;
 		}
-		ret = cursor->c_close(cursor);
+		cursor->c_close(cursor);
 		cursor = NULL;
-		endtrans();
+		firstpass = 0;
+		db4_endtrans(dbctx);
 	}
 	llfree(wordlist, NULL);
 	wordlist = NULL;
-	
-	starttrans();
+
+	if (keylist.count > config.maxkeys) {
+		keylist.count = config.maxkeys;
+	}
+
+	db4_starttrans(dbctx);
 	for (i = 0; i < keylist.count; i++) {
-		numkeys += fetch_key(keylist.keys[i],
+		numkeys += db4_fetch_key_id(dbctx, keylist.keys[i],
 			publickey,
 			true);
 	}
@@ -493,114 +521,93 @@ int fetch_key_text(const char *search, struct openpgp_publickey **publickey)
 	free(searchtext);
 	searchtext = NULL;
 
-	endtrans();
-	
+	db4_endtrans(dbctx);
+
 	return (numkeys);
 }
 
+static int db4_fetch_key_skshash(struct onak_dbctx *dbctx,
+		const struct skshash *hash,
+		struct openpgp_publickey **publickey)
+{
+	struct onak_db4_dbctx *privctx = (struct onak_db4_dbctx *) dbctx->priv;
+	DBT       key, data;
+	DBC      *cursor = NULL;
+	uint64_t  keyid = 0;
+	int       ret = 0;
+
+	ret = privctx->skshashdb->cursor(privctx->skshashdb,
+			privctx->txn,
+			&cursor,
+			0);   /* flags */
+
+	if (ret != 0) {
+		return 0;
+	}
+
+	memset(&key, 0, sizeof(key));
+	memset(&data, 0, sizeof(data));
+	key.data = (void *) hash->hash;
+	key.size = sizeof(hash->hash);
+	data.flags = DB_DBT_MALLOC;
+
+	ret = cursor->c_get(cursor,
+		&key,
+		&data,
+		DB_SET);
+
+	if (ret == 0) {
+		keyid = *(uint64_t *) data.data;
+
+		if (data.data != NULL) {
+			free(data.data);
+			data.data = NULL;
+		}
+	}
+
+	cursor->c_close(cursor);
+	cursor = NULL;
+
+	return db4_fetch_key_id(dbctx, keyid, publickey, false);
+}
+
 /**
- *	store_key - Takes a key and stores it.
- *	@publickey: A pointer to the public key to store.
+ *	delete_key - Given a keyid delete the key from storage.
+ *	@keyid: The keyid to delete.
  *	@intrans: If we're already in a transaction.
- *	@update: If true the key exists and should be updated.
  *
- *	Again we just use the hex representation of the keyid as the filename
- *	to store the key to. We flatten the public key to a list of OpenPGP
- *	packets and then use write_openpgp_stream() to write the stream out to
- *	the file. If update is true then we delete the old key first, otherwise
- *	we trust that it doesn't exist.
+ *	This function deletes a public key from whatever storage mechanism we
+ *	are using. Returns 0 if the key existed.
  */
-int store_key(struct openpgp_publickey *publickey, bool intrans, bool update)
+static int db4_delete_key(struct onak_dbctx *dbctx,
+		uint64_t keyid, bool intrans)
 {
-	struct     openpgp_packet_list *packets = NULL;
-	struct     openpgp_packet_list *list_end = NULL;
-	struct     openpgp_publickey *next = NULL;
-	int        ret = 0;
-	int        i = 0;
-	struct     buffer_ctx storebuf;
-	DBT        key;
-	DBT        data;
-	uint64_t   keyid = 0;
+	struct onak_db4_dbctx *privctx = (struct onak_db4_dbctx *) dbctx->priv;
+	struct openpgp_publickey *publickey = NULL;
+	DBT key, data;
+	DBC *cursor = NULL;
 	uint32_t   shortkeyid = 0;
 	uint64_t  *subkeyids = NULL;
-	char     **uids = NULL;
-	char      *primary = NULL;
+	int ret = 0;
+	int i;
+	char **uids = NULL;
+	char *primary = NULL;
 	unsigned char worddb_data[12];
 	struct ll *wordlist = NULL;
 	struct ll *curword  = NULL;
-	bool       deadlock = false;
-
-	keyid = get_keyid(publickey);
+	bool deadlock = false;
+	struct skshash hash;
 
 	if (!intrans) {
-		starttrans();
-	}
-
-	/*
-	 * Delete the key if we already have it.
-	 *
-	 * TODO: Can we optimize this perhaps? Possibly when other data is
-	 * involved as well? I suspect this is easiest and doesn't make a lot
-	 * of difference though - the largest chunk of data is the keydata and
-	 * it definitely needs updated.
-	 */
-	if (update) {
-		deadlock = (delete_key(keyid, true) == -1);
+		db4_starttrans(dbctx);
 	}
 
-	/*
-	 * Convert the key to a flat set of binary data.
-	 */
-	if (!deadlock) {
-		next = publickey->next;
-		publickey->next = NULL;
-		flatten_publickey(publickey, &packets, &list_end);
-		publickey->next = next;
-
-		storebuf.offset = 0; 
-		storebuf.size = 8192;
-		storebuf.buffer = malloc(8192);
-	
-		write_openpgp_stream(buffer_putchar, &storebuf, packets);
-
-		/*
-		 * Now we have the key data store it in the DB; the keyid is
-		 * the key.
-		 */
-		memset(&key, 0, sizeof(key));
-		memset(&data, 0, sizeof(data));
-		key.data = &keyid;
-		key.size = sizeof(keyid);
-		data.size = storebuf.offset;
-		data.data = storebuf.buffer;
-
-		ret = keydb(keyid)->put(keydb(keyid),
-				txn,
-				&key,
-				&data,
-				0); /* flags*/
-		if (ret != 0) {
-			logthing(LOGTHING_ERROR,
-					"Problem storing key: %s",
-					db_strerror(ret));
-			if (ret == DB_LOCK_DEADLOCK) {
-				deadlock = true;
-			}
-		}
-
-		free(storebuf.buffer);
-		storebuf.buffer = NULL;
-		storebuf.size = 0;
-		storebuf.offset = 0; 
-	
-		free_packet_list(packets);
-		packets = NULL;
-	}
+	db4_fetch_key_id(dbctx, keyid, &publickey, true);
 
 	/*
-	 * Walk through our uids storing the words into the db with the keyid.
+	 * Walk through the uids removing the words from the worddb.
 	 */
-	if (!deadlock) {
+	if (publickey != NULL) {
 		uids = keyuids(publickey, &primary);
 	}
 	if (uids != NULL) {
@@ -608,6 +615,11 @@ int store_key(struct openpgp_publickey *publickey, bool intrans, bool update)
 			wordlist = makewordlist(wordlist, uids[i]);
 		}
 
+		privctx->worddb->cursor(privctx->worddb,
+			privctx->txn,
+			&cursor,
+			0);   /* flags */
+
 		for (curword = wordlist; curword != NULL && !deadlock;
 				curword = curword->next) {
 			memset(&key, 0, sizeof(key));
@@ -632,20 +644,67 @@ int store_key(struct openpgp_publickey *publickey, bool intrans, bool update)
 			worddb_data[ 8] = (keyid >> 24) & 0xFF;
 			worddb_data[ 9] = (keyid >> 16) & 0xFF;
 			worddb_data[10] = (keyid >>  8) & 0xFF;
-			worddb_data[11] = keyid & 0xFF; 
-			ret = worddb->put(worddb,
-				txn,
+			worddb_data[11] = keyid & 0xFF;
+
+			ret = cursor->c_get(cursor,
 				&key,
 				&data,
-				0);
+				DB_GET_BOTH);
+
+			if (ret == 0) {
+				ret = cursor->c_del(cursor, 0);
+			}
+
 			if (ret != 0) {
 				logthing(LOGTHING_ERROR,
-					"Problem storing word: %s",
-					db_strerror(ret));
+					"Problem deleting word: %s "
+					"(0x%016" PRIX64 ")",
+					db_strerror(ret),
+					keyid);
+				if (ret == DB_LOCK_DEADLOCK) {
+					deadlock = true;
+				}
+			}
+		}
+		cursor->c_close(cursor);
+		cursor = NULL;
+
+		ret = privctx->skshashdb->cursor(privctx->skshashdb,
+			privctx->txn,
+			&cursor,
+			0);   /* flags */
+		if (ret == 0) {
+			get_skshash(publickey, &hash);
+
+			memset(&key, 0, sizeof(key));
+			memset(&data, 0, sizeof(data));
+			key.data = hash.hash;
+			key.size = sizeof(hash.hash);
+			data.data = &keyid;
+			data.size = sizeof(keyid);
+
+			ret = cursor->c_get(cursor,
+				&key,
+				&data,
+				DB_GET_BOTH);
+
+			if (ret == 0) {
+				ret = cursor->c_del(cursor, 0);
+			}
+
+			if (ret != 0) {
+				logthing(LOGTHING_ERROR,
+					"Problem deleting skshash: %s "
+					"(0x%016" PRIX64 ")",
+					db_strerror(ret),
+					keyid);
 				if (ret == DB_LOCK_DEADLOCK) {
 					deadlock = true;
 				}
 			}
+
+			cursor->c_close(cursor);
+			cursor = NULL;
 		}
 
 		/*
@@ -658,13 +717,16 @@ int store_key(struct openpgp_publickey *publickey, bool intrans, bool update)
 		}
 		free(uids);
 		uids = NULL;
+		free_publickey(publickey);
+		publickey = NULL;
 	}
 
-	/*
-	 * Write the truncated 32 bit keyid so we can lookup the full id for
-	 * queries.
-	 */
 	if (!deadlock) {
+		privctx->id32db->cursor(privctx->id32db,
+			privctx->txn,
+			&cursor,
+			0);   /* flags */
+
 		shortkeyid = keyid & 0xFFFFFFFF;
 
 		memset(&key, 0, sizeof(key));
@@ -674,25 +736,45 @@ int store_key(struct openpgp_publickey *publickey, bool intrans, bool update)
 		data.data = &keyid;
 		data.size = sizeof(keyid);
 
-		ret = id32db->put(id32db,
-			txn,
+		ret = cursor->c_get(cursor,
 			&key,
 			&data,
-			0);
+			DB_GET_BOTH);
+
+		if (ret == 0) {
+			ret = cursor->c_del(cursor, 0);
+		}
+
 		if (ret != 0) {
 			logthing(LOGTHING_ERROR,
-				"Problem storing short keyid: %s",
-				db_strerror(ret));
+				"Problem deleting short keyid: %s "
+				"(0x%016" PRIX64 ")",
+				db_strerror(ret),
+				keyid);
 			if (ret == DB_LOCK_DEADLOCK) {
 				deadlock = true;
 			}
 		}
-	}
 
-	if (!deadlock) {
 		subkeyids = keysubkeys(publickey);
 		i = 0;
 		while (subkeyids != NULL && subkeyids[i] != 0) {
+			memset(&key, 0, sizeof(key));
+			key.data = &subkeyids[i];
+			key.size = sizeof(subkeyids[i]);
+			privctx->subkeydb->del(privctx->subkeydb,
+					privctx->txn, &key, 0);
+			if (ret != 0) {
+				logthing(LOGTHING_ERROR,
+					"Problem deleting subkey id: %s "
+					"(0x%016" PRIX64 ")",
+					db_strerror(ret),
+					keyid);
+				if (ret == DB_LOCK_DEADLOCK) {
+					deadlock = true;
+				}
+			}
+
 			shortkeyid = subkeyids[i++] & 0xFFFFFFFF;
 
 			memset(&key, 0, sizeof(key));
@@ -702,15 +784,21 @@ int store_key(struct openpgp_publickey *publickey, bool intrans, bool update)
 			data.data = &keyid;
 			data.size = sizeof(keyid);
 
-			ret = id32db->put(id32db,
-				txn,
+			ret = cursor->c_get(cursor,
 				&key,
 				&data,
-				0);
+				DB_GET_BOTH);
+
+			if (ret == 0) {
+				ret = cursor->c_del(cursor, 0);
+			}
+
 			if (ret != 0) {
 				logthing(LOGTHING_ERROR,
-					"Problem storing short keyid: %s",
-					db_strerror(ret));
+					"Problem deleting short keyid: %s "
+					"(0x%016" PRIX64 ")",
+					db_strerror(ret),
+					keyid);
 				if (ret == DB_LOCK_DEADLOCK) {
 					deadlock = true;
 				}
@@ -720,60 +808,143 @@ int store_key(struct openpgp_publickey *publickey, bool intrans, bool update)
 			free(subkeyids);
 			subkeyids = NULL;
 		}
+		cursor->c_close(cursor);
+		cursor = NULL;
+	}
+
+	if (!deadlock) {
+		key.data = &keyid;
+		key.size = sizeof(keyid);
+
+		keydb(privctx, keyid)->del(keydb(privctx, keyid),
+				privctx->txn,
+				&key,
+				0); /* flags */
 	}
 
 	if (!intrans) {
-		endtrans();
+		db4_endtrans(dbctx);
 	}
 
-	return deadlock ? -1 : 0 ;
+	return deadlock ? (-1) : (ret == DB_NOTFOUND);
 }
 
 /**
- *	delete_key - Given a keyid delete the key from storage.
- *	@keyid: The keyid to delete.
+ *	store_key - Takes a key and stores it.
+ *	@publickey: A pointer to the public key to store.
  *	@intrans: If we're already in a transaction.
+ *	@update: If true the key exists and should be updated.
  *
- *	This function deletes a public key from whatever storage mechanism we
- *	are using. Returns 0 if the key existed.
+ *	Again we just use the hex representation of the keyid as the filename
+ *	to store the key to. We flatten the public key to a list of OpenPGP
+ *	packets and then use write_openpgp_stream() to write the stream out to
+ *	the file. If update is true then we delete the old key first, otherwise
+ *	we trust that it doesn't exist.
  */
-int delete_key(uint64_t keyid, bool intrans)
+static int db4_store_key(struct onak_dbctx *dbctx,
+		struct openpgp_publickey *publickey, bool intrans,
+		bool update)
 {
-	struct openpgp_publickey *publickey = NULL;
-	DBT key, data;
-	DBC *cursor = NULL;
+	struct onak_db4_dbctx *privctx = (struct onak_db4_dbctx *) dbctx->priv;
+	struct     openpgp_packet_list *packets = NULL;
+	struct     openpgp_packet_list *list_end = NULL;
+	struct     openpgp_publickey *next = NULL;
+	int        ret = 0;
+	int        i = 0;
+	struct     buffer_ctx storebuf;
+	DBT        key;
+	DBT        data;
+	uint64_t   keyid = 0;
 	uint32_t   shortkeyid = 0;
 	uint64_t  *subkeyids = NULL;
-	int ret = 0;
-	int i;
-	char **uids = NULL;
-	char *primary = NULL;
+	char     **uids = NULL;
+	char      *primary = NULL;
 	unsigned char worddb_data[12];
 	struct ll *wordlist = NULL;
 	struct ll *curword  = NULL;
-	bool deadlock = false;
+	bool       deadlock = false;
+	struct skshash hash;
+
+	if (get_keyid(publickey, &keyid) != ONAK_E_OK) {
+		logthing(LOGTHING_ERROR, "Couldn't find key ID for key.");
+		return 0;
+	}
 
 	if (!intrans) {
-		starttrans();
+		db4_starttrans(dbctx);
 	}
 
-	fetch_key(keyid, &publickey, true);
+	/*
+	 * Delete the key if we already have it.
+	 *
+	 * TODO: Can we optimize this perhaps? Possibly when other data is
+	 * involved as well? I suspect this is easiest and doesn't make a lot
+	 * of difference though - the largest chunk of data is the keydata and
+	 * it definitely needs updated.
+	 */
+	if (update) {
+		deadlock = (db4_delete_key(dbctx, keyid, true) == -1);
+	}
 
 	/*
-	 * Walk through the uids removing the words from the worddb.
+	 * Convert the key to a flat set of binary data.
 	 */
-	if (publickey != NULL) {
+	if (!deadlock) {
+		next = publickey->next;
+		publickey->next = NULL;
+		flatten_publickey(publickey, &packets, &list_end);
+		publickey->next = next;
+
+		storebuf.offset = 0;
+		storebuf.size = 8192;
+		storebuf.buffer = malloc(8192);
+
+		write_openpgp_stream(buffer_putchar, &storebuf, packets);
+
+		/*
+		 * Now we have the key data store it in the DB; the keyid is
+		 * the key.
+		 */
+		memset(&key, 0, sizeof(key));
+		memset(&data, 0, sizeof(data));
+		key.data = &keyid;
+		key.size = sizeof(keyid);
+		data.size = storebuf.offset;
+		data.data = storebuf.buffer;
+
+		ret = keydb(privctx, keyid)->put(keydb(privctx, keyid),
+				privctx->txn,
+				&key,
+				&data,
+				0); /* flags*/
+		if (ret != 0) {
+			logthing(LOGTHING_ERROR,
+					"Problem storing key: %s",
+					db_strerror(ret));
+			if (ret == DB_LOCK_DEADLOCK) {
+				deadlock = true;
+			}
+		}
+
+		free(storebuf.buffer);
+		storebuf.buffer = NULL;
+		storebuf.size = 0;
+		storebuf.offset = 0;
+
+		free_packet_list(packets);
+		packets = NULL;
+	}
+
+	/*
+	 * Walk through our uids storing the words into the db with the keyid.
+	 */
+	if (!deadlock) {
 		uids = keyuids(publickey, &primary);
 	}
 	if (uids != NULL) {
 		for (i = 0; ret == 0 && uids[i] != NULL; i++) {
 			wordlist = makewordlist(wordlist, uids[i]);
 		}
-				
-		ret = worddb->cursor(worddb,
-			txn,
-			&cursor,
-			0);   /* flags */
 
 		for (curword = wordlist; curword != NULL && !deadlock;
 				curword = curword->next) {
@@ -799,33 +970,21 @@ int delete_key(uint64_t keyid, bool intrans)
 			worddb_data[ 8] = (keyid >> 24) & 0xFF;
 			worddb_data[ 9] = (keyid >> 16) & 0xFF;
 			worddb_data[10] = (keyid >>  8) & 0xFF;
-			worddb_data[11] = keyid & 0xFF; 
-
-			ret = cursor->c_get(cursor,
+			worddb_data[11] = keyid & 0xFF;
+			ret = privctx->worddb->put(privctx->worddb,
+				privctx->txn,
 				&key,
 				&data,
-				DB_GET_BOTH);
-
-			if (ret == 0) {
-				ret = cursor->c_del(cursor, 0);
-				if (ret != 0) {
-					logthing(LOGTHING_ERROR,
-						"Problem deleting word: %s",
-						db_strerror(ret));
-				}
-			}
-
+				0);
 			if (ret != 0) {
 				logthing(LOGTHING_ERROR,
-					"Problem deleting word: %s",
+					"Problem storing word: %s",
 					db_strerror(ret));
 				if (ret == DB_LOCK_DEADLOCK) {
 					deadlock = true;
 				}
 			}
 		}
-		ret = cursor->c_close(cursor);
-		cursor = NULL;
 
 		/*
 		 * Free our UID and word lists.
@@ -837,16 +996,13 @@ int delete_key(uint64_t keyid, bool intrans)
 		}
 		free(uids);
 		uids = NULL;
-		free_publickey(publickey);
-		publickey = NULL;
 	}
 
+	/*
+	 * Write the truncated 32 bit keyid so we can lookup the full id for
+	 * queries.
+	 */
 	if (!deadlock) {
-		ret = id32db->cursor(id32db,
-			txn,
-			&cursor,
-			0);   /* flags */
-
 		shortkeyid = keyid & 0xFFFFFFFF;
 
 		memset(&key, 0, sizeof(key));
@@ -856,32 +1012,48 @@ int delete_key(uint64_t keyid, bool intrans)
 		data.data = &keyid;
 		data.size = sizeof(keyid);
 
-		ret = cursor->c_get(cursor,
+		ret = privctx->id32db->put(privctx->id32db,
+			privctx->txn,
 			&key,
 			&data,
-			DB_GET_BOTH);
-
-		if (ret == 0) {
-			ret = cursor->c_del(cursor, 0);
-			if (ret != 0) {
-				logthing(LOGTHING_ERROR,
-					"Problem deleting short keyid: %s",
-					db_strerror(ret));
-			}
-		}
-
+			0);
 		if (ret != 0) {
 			logthing(LOGTHING_ERROR,
-				"Problem deleting short keyid: %s",
+				"Problem storing short keyid: %s",
 				db_strerror(ret));
 			if (ret == DB_LOCK_DEADLOCK) {
 				deadlock = true;
 			}
 		}
+	}
 
+	if (!deadlock) {
 		subkeyids = keysubkeys(publickey);
 		i = 0;
 		while (subkeyids != NULL && subkeyids[i] != 0) {
+			/* Store the subkey ID -> main key ID mapping */
+			memset(&key, 0, sizeof(key));
+			memset(&data, 0, sizeof(data));
+			key.data = &subkeyids[i];
+			key.size = sizeof(subkeyids[i]);
+			data.data = &keyid;
+			data.size = sizeof(keyid);
+
+			ret = privctx->subkeydb->put(privctx->subkeydb,
+				privctx->txn,
+				&key,
+				&data,
+				0);
+			if (ret != 0) {
+				logthing(LOGTHING_ERROR,
+					"Problem storing subkey keyid: %s",
+					db_strerror(ret));
+				if (ret == DB_LOCK_DEADLOCK) {
+					deadlock = true;
+				}
+			}
+
+			/* Store the short subkey ID -> main key ID mapping */
 			shortkeyid = subkeyids[i++] & 0xFFFFFFFF;
 
 			memset(&key, 0, sizeof(key));
@@ -891,24 +1063,14 @@ int delete_key(uint64_t keyid, bool intrans)
 			data.data = &keyid;
 			data.size = sizeof(keyid);
 
-			ret = cursor->c_get(cursor,
+			ret = privctx->id32db->put(privctx->id32db,
+				privctx->txn,
 				&key,
 				&data,
-				DB_GET_BOTH);
-
-			if (ret == 0) {
-				ret = cursor->c_del(cursor, 0);
-				if (ret != 0) {
-					logthing(LOGTHING_ERROR,
-						"Problem deleting short"
-						" keyid: %s",
-						db_strerror(ret));
-				}
-			}
-
+				0);
 			if (ret != 0) {
 				logthing(LOGTHING_ERROR,
-					"Problem deleting short keyid: %s",
+					"Problem storing short keyid: %s",
 					db_strerror(ret));
 				if (ret == DB_LOCK_DEADLOCK) {
 					deadlock = true;
@@ -919,26 +1081,37 @@ int delete_key(uint64_t keyid, bool intrans)
 			free(subkeyids);
 			subkeyids = NULL;
 		}
-
-		ret = cursor->c_close(cursor);
-		cursor = NULL;
 	}
 
 	if (!deadlock) {
-		key.data = &keyid;
-		key.size = sizeof(keyid);
+		get_skshash(publickey, &hash);
+		memset(&key, 0, sizeof(key));
+		memset(&data, 0, sizeof(data));
+		key.data = hash.hash;
+		key.size = sizeof(hash.hash);
+		data.data = &keyid;
+		data.size = sizeof(keyid);
 
-		keydb(keyid)->del(keydb(keyid),
-				txn,
-				&key,
-				0); /* flags */
+		ret = privctx->skshashdb->put(privctx->skshashdb,
+			privctx->txn,
+			&key,
+			&data,
+			0);
+		if (ret != 0) {
+			logthing(LOGTHING_ERROR,
+				"Problem storing SKS hash: %s",
+				db_strerror(ret));
+			if (ret == DB_LOCK_DEADLOCK) {
+				deadlock = true;
+			}
+		}
 	}
 
 	if (!intrans) {
-		endtrans();
+		db4_endtrans(dbctx);
 	}
 
-	return deadlock ? (-1) : (ret == DB_NOTFOUND);
+	return deadlock ? -1 : 0 ;
 }
 
 /**
@@ -952,9 +1125,11 @@ int delete_key(uint64_t keyid, bool intrans)
  *
  *	Returns the number of keys we iterated over.
  */
-int iterate_keys(void (*iterfunc)(void *ctx, struct openpgp_publickey *key),
+static int db4_iterate_keys(struct onak_dbctx *dbctx,
+		void (*iterfunc)(void *ctx, struct openpgp_publickey *key),
 		void *ctx)
 {
+	struct onak_db4_dbctx *privctx = (struct onak_db4_dbctx *) dbctx->priv;
 	DBT                         dbkey, data;
 	DBC                        *cursor = NULL;
 	int                         ret = 0;
@@ -964,12 +1139,16 @@ int iterate_keys(void (*iterfunc)(void *ctx, struct openpgp_publickey *key),
 	struct openpgp_packet_list *packets = NULL;
 	struct openpgp_publickey   *key = NULL;
 
-	for (i = 0; i < numdbs; i++) {
-		ret = dbconns[i]->cursor(dbconns[i],
+	for (i = 0; i < privctx->numdbs; i++) {
+		ret = privctx->dbconns[i]->cursor(privctx->dbconns[i],
 			NULL,
 			&cursor,
 			0);   /* flags */
 
+		if (ret != 0) {
+			continue;
+		}
+
 		memset(&dbkey, 0, sizeof(dbkey));
 		memset(&data, 0, sizeof(data));
 		ret = cursor->c_get(cursor, &dbkey, &data, DB_NEXT);
@@ -982,12 +1161,12 @@ int iterate_keys(void (*iterfunc)(void *ctx, struct openpgp_publickey *key),
 			parse_keys(packets, &key);
 
 			iterfunc(ctx, key);
-			
+
 			free_publickey(key);
 			key = NULL;
 			free_packet_list(packets);
 			packets = NULL;
-			
+
 			memset(&dbkey, 0, sizeof(dbkey));
 			memset(&data, 0, sizeof(data));
 			ret = cursor->c_get(cursor, &dbkey, &data,
@@ -1000,66 +1179,381 @@ int iterate_keys(void (*iterfunc)(void *ctx, struct openpgp_publickey *key),
 				db_strerror(ret));
 		}
 
-		ret = cursor->c_close(cursor);
+		cursor->c_close(cursor);
 		cursor = NULL;
 	}
-	
+
 	return numkeys;
 }
 
+/*
+ * Include the basic keydb routines.
+ */
+#define NEED_GETKEYSIGS 1
+#define NEED_KEYID2UID 1
+#define NEED_UPDATEKEYS 1
+#define NEED_GET_FP 1
+#include "keydb.c"
+
 /**
- *	getfullkeyid - Maps a 32bit key id to a 64bit one.
- *	@keyid: The 32bit keyid.
+ *	cleanupdb - De-initialize the key database.
  *
- *	This function maps a 32bit key id to the full 64bit one. It returns the
- *	full keyid. If the key isn't found a keyid of 0 is returned.
+ *	This function should be called upon program exit to allow the DB to
+ *	cleanup after itself.
  */
-uint64_t getfullkeyid(uint64_t keyid)
+static void db4_cleanupdb(struct onak_dbctx *dbctx)
 {
-	DBT       key, data;
-	DBC      *cursor = NULL;
-	uint32_t  shortkeyid = 0;
-	int       ret = 0;
+	struct onak_db4_dbctx *privctx = (struct onak_db4_dbctx *) dbctx->priv;
+	int i = 0;
 
-	if (keyid < 0x100000000LL) {
-		ret = id32db->cursor(id32db,
-				txn,
-				&cursor,
-				0);   /* flags */
+	if (privctx->dbenv != NULL) {
+		privctx->dbenv->txn_checkpoint(privctx->dbenv, 0, 0, 0);
+		if (privctx->subkeydb != NULL) {
+			privctx->subkeydb->close(privctx->subkeydb, 0);
+			privctx->subkeydb = NULL;
+		}
+		if (privctx->skshashdb != NULL) {
+			privctx->skshashdb->close(privctx->skshashdb, 0);
+			privctx->skshashdb = NULL;
+		}
+		if (privctx->id32db != NULL) {
+			privctx->id32db->close(privctx->id32db, 0);
+			privctx->id32db = NULL;
+		}
+		if (privctx->worddb != NULL) {
+			privctx->worddb->close(privctx->worddb, 0);
+			privctx->worddb = NULL;
+		}
+		for (i = 0; i < privctx->numdbs; i++) {
+			if (privctx->dbconns[i] != NULL) {
+				privctx->dbconns[i]->close(privctx->dbconns[i],
+						0);
+				privctx->dbconns[i] = NULL;
+			}
+		}
+		free(privctx->dbconns);
+		privctx->dbconns = NULL;
+		privctx->dbenv->close(privctx->dbenv, 0);
+		privctx->dbenv = NULL;
+	}
 
-		shortkeyid = keyid & 0xFFFFFFFF;
+	free(privctx);
+	dbctx->priv = NULL;
+	free(dbctx);
+}
 
-		memset(&key, 0, sizeof(key));
-		memset(&data, 0, sizeof(data));
-		key.data = &shortkeyid;
-		key.size = sizeof(shortkeyid);
-		data.flags = DB_DBT_MALLOC;
+/**
+ *	initdb - Initialize the key database.
+ *
+ *	This function should be called before any of the other functions in
+ *	this file are called in order to allow the DB to be initialized ready
+ *	for access.
+ */
+struct onak_dbctx *keydb_db4_init(bool readonly)
+{
+	char       buf[1024];
+	FILE      *numdb = NULL;
+	int        ret = 0;
+	int        i = 0;
+	uint32_t   flags = 0;
+	struct stat statbuf;
+	int        maxlocks;
+	struct onak_dbctx *dbctx;
+	struct onak_db4_dbctx *privctx;
+
+	dbctx = malloc(sizeof(*dbctx));
+	if (dbctx == NULL) {
+		return NULL;
+	}
+	dbctx->priv = privctx = calloc(1, sizeof(*privctx));
+	if (privctx == NULL) {
+		free(dbctx);
+		return NULL;
+	}
 
-		ret = cursor->c_get(cursor,
-			&key,
-			&data,
-			DB_SET);
+	/* Default to 16 key data DBs */
+	privctx->numdbs = 16;
 
-		if (ret == 0) {
-			keyid = *(uint64_t *) data.data;
+	snprintf(buf, sizeof(buf) - 1, "%s/%s", config.db_dir,
+			DB4_UPGRADE_FILE);
+	ret = stat(buf, &statbuf);
+	while ((ret == 0) || (errno != ENOENT)) {
+		if (ret != 0) {
+			logthing(LOGTHING_CRITICAL, "Couldn't stat upgrade "
+				"lock file: %s (%d)", strerror(errno), ret);
+			exit(1);
+		}
+		logthing(LOGTHING_DEBUG, "DB4 upgrade in progress; waiting.");
+		sleep(5);
+		ret = stat(buf, &statbuf);
+	}
+	ret = 0;
 
-			if (data.data != NULL) {
-				free(data.data);
-				data.data = NULL;
+	snprintf(buf, sizeof(buf) - 1, "%s/num_keydb", config.db_dir);
+	numdb = fopen(buf, "r");
+	if (numdb != NULL) {
+		if (fgets(buf, sizeof(buf), numdb) != NULL) {
+			privctx->numdbs = atoi(buf);
+		}
+		fclose(numdb);
+	} else if (!readonly) {
+		logthing(LOGTHING_ERROR, "Couldn't open num_keydb: %s",
+				strerror(errno));
+		numdb = fopen(buf, "w");
+		if (numdb != NULL) {
+			fprintf(numdb, "%d", privctx->numdbs);
+			fclose(numdb);
+		} else {
+			logthing(LOGTHING_ERROR,
+				"Couldn't write num_keydb: %s",
+				strerror(errno));
+		}
+	}
+
+	privctx->dbconns = calloc(privctx->numdbs, sizeof (DB *));
+	if (privctx->dbconns == NULL) {
+		logthing(LOGTHING_CRITICAL,
+				"Couldn't allocate memory for dbconns");
+		ret = 1;
+	}
+
+	if (ret == 0) {
+		ret = db_env_create(&privctx->dbenv, 0);
+		if (ret != 0) {
+			logthing(LOGTHING_CRITICAL,
+				"db_env_create: %s", db_strerror(ret));
+		}
+	}
+
+	/*
+	 * Up the number of locks we're allowed at once. We base this on
+	 * the maximum number of keys we're going to return.
+	 */
+	maxlocks = config.maxkeys * 16;
+	if (maxlocks < 1000) {
+		maxlocks = 1000;
+	}
+	privctx->dbenv->set_lk_max_locks(privctx->dbenv, maxlocks);
+	privctx->dbenv->set_lk_max_objects(privctx->dbenv, maxlocks);
+
+	/*
+	 * Enable deadlock detection so that we don't block indefinitely on
+	 * anything. What we really want is simple 2 state locks, but I'm not
+	 * sure how to make the standard DB functions do that yet.
+	 */
+	if (ret == 0) {
+		privctx->dbenv->set_errcall(privctx->dbenv, &db4_errfunc);
+		ret = privctx->dbenv->set_lk_detect(privctx->dbenv, DB_LOCK_DEFAULT);
+		if (ret != 0) {
+			logthing(LOGTHING_CRITICAL,
+				"db_env_create: %s", db_strerror(ret));
+		}
+	}
+
+	if (ret == 0) {
+		ret = privctx->dbenv->open(privctx->dbenv, config.db_dir,
+				DB_INIT_LOG | DB_INIT_MPOOL | DB_INIT_LOCK |
+				DB_INIT_TXN |
+				DB_CREATE,
+				0);
+#ifdef DB_VERSION_MISMATCH
+		if (ret == DB_VERSION_MISMATCH) {
+			privctx->dbenv->close(privctx->dbenv, 0);
+			privctx->dbenv = NULL;
+			ret = db4_upgradedb(privctx);
+			if (ret == 0) {
+				ret = db_env_create(&privctx->dbenv, 0);
+			}
+			if (ret == 0) {
+				privctx->dbenv->set_errcall(privctx->dbenv,
+					&db4_errfunc);
+				privctx->dbenv->set_lk_detect(privctx->dbenv,
+					DB_LOCK_DEFAULT);
+				ret = privctx->dbenv->open(privctx->dbenv,
+					config.db_dir,
+					DB_INIT_LOG | DB_INIT_MPOOL |
+					DB_INIT_LOCK | DB_INIT_TXN |
+					DB_CREATE | DB_RECOVER,
+					0);
+
+				if (ret == 0) {
+					privctx->dbenv->txn_checkpoint(
+							privctx->dbenv,
+							0,
+							0,
+							DB_FORCE);
+				}
 			}
 		}
+#endif
+		if (ret != 0) {
+			logthing(LOGTHING_CRITICAL,
+					"Error opening db environment: %s (%s)",
+					config.db_dir,
+					db_strerror(ret));
+			if (privctx->dbenv != NULL) {
+				privctx->dbenv->close(privctx->dbenv, 0);
+				privctx->dbenv = NULL;
+			}
+		}
+	}
 
-		ret = cursor->c_close(cursor);
-		cursor = NULL;
+	if (ret == 0) {
+		db4_starttrans(dbctx);
+
+		for (i = 0; !ret && i < privctx->numdbs; i++) {
+			ret = db_create(&privctx->dbconns[i],
+					privctx->dbenv, 0);
+			if (ret != 0) {
+				logthing(LOGTHING_CRITICAL,
+					"db_create: %s", db_strerror(ret));
+			}
+
+			if (ret == 0) {
+				snprintf(buf, 1023, "keydb.%d.db", i);
+				flags = DB_CREATE;
+				if (readonly) {
+					flags = DB_RDONLY;
+				}
+				ret = privctx->dbconns[i]->open(
+						privctx->dbconns[i],
+						privctx->txn,
+						buf,
+						"keydb",
+						DB_HASH,
+						flags,
+						0664);
+				if (ret != 0) {
+					logthing(LOGTHING_CRITICAL,
+						"Error opening key database:"
+						" %s (%s)",
+						buf,
+						db_strerror(ret));
+				}
+			}
+		}
 	}
-	
-	return keyid;
-}
 
-/*
- * Include the basic keydb routines.
- */
-#define NEED_GETKEYSIGS 1
-#define NEED_KEYID2UID 1
-#define NEED_UPDATEKEYS 1
-#include "keydb.c"
+	if (ret == 0) {
+		ret = db_create(&privctx->worddb, privctx->dbenv, 0);
+		if (ret != 0) {
+			logthing(LOGTHING_CRITICAL, "db_create: %s",
+					db_strerror(ret));
+		}
+	}
+
+	if (ret == 0) {
+		ret = privctx->worddb->set_flags(privctx->worddb, DB_DUP);
+	}
+
+	if (ret == 0) {
+		ret = privctx->worddb->open(privctx->worddb, privctx->txn,
+				"worddb", "worddb", DB_BTREE,
+				flags,
+				0664);
+		if (ret != 0) {
+			logthing(LOGTHING_CRITICAL,
+					"Error opening word database: %s (%s)",
+					"worddb",
+					db_strerror(ret));
+		}
+	}
+
+	if (ret == 0) {
+		ret = db_create(&privctx->id32db, privctx->dbenv, 0);
+		if (ret != 0) {
+			logthing(LOGTHING_CRITICAL, "db_create: %s",
+					db_strerror(ret));
+		}
+	}
+
+	if (ret == 0) {
+		ret = privctx->id32db->set_flags(privctx->id32db, DB_DUP);
+	}
+
+	if (ret == 0) {
+		ret = privctx->id32db->open(privctx->id32db, privctx->txn,
+				"id32db", "id32db", DB_HASH,
+				flags,
+				0664);
+		if (ret != 0) {
+			logthing(LOGTHING_CRITICAL,
+					"Error opening id32 database: %s (%s)",
+					"id32db",
+					db_strerror(ret));
+		}
+	}
+
+	if (ret == 0) {
+		ret = db_create(&privctx->skshashdb, privctx->dbenv, 0);
+		if (ret != 0) {
+			logthing(LOGTHING_CRITICAL, "db_create: %s",
+					db_strerror(ret));
+		}
+	}
+
+	if (ret == 0) {
+		ret = privctx->skshashdb->open(privctx->skshashdb, privctx->txn,
+				"skshashdb",
+				"skshashdb", DB_HASH,
+				flags,
+				0664);
+		if (ret != 0) {
+			logthing(LOGTHING_CRITICAL,
+				"Error opening skshash database: %s (%s)",
+				"skshashdb",
+				db_strerror(ret));
+		}
+	}
+
+	if (ret == 0) {
+		ret = db_create(&privctx->subkeydb, privctx->dbenv, 0);
+		if (ret != 0) {
+			logthing(LOGTHING_CRITICAL, "db_create: %s",
+					db_strerror(ret));
+		}
+	}
+
+	if (ret == 0) {
+		ret = privctx->subkeydb->open(privctx->subkeydb, privctx->txn,
+				"subkeydb", "subkeydb",
+				DB_HASH,
+				flags,
+				0664);
+		if (ret != 0) {
+			logthing(LOGTHING_CRITICAL,
+				"Error opening subkey database: %s (%s)",
+				"subkeydb",
+				db_strerror(ret));
+		}
+	}
+
+	if (privctx->txn != NULL) {
+		db4_endtrans(dbctx);
+	}
+
+	if (ret != 0) {
+		db4_cleanupdb(dbctx);
+		logthing(LOGTHING_CRITICAL,
+				"Error opening database; exiting");
+		exit(EXIT_FAILURE);
+	}
+
+	dbctx->cleanupdb		= db4_cleanupdb;
+	dbctx->starttrans		= db4_starttrans;
+	dbctx->endtrans			= db4_endtrans;
+	dbctx->fetch_key_id		= db4_fetch_key_id;
+	dbctx->fetch_key_fp		= generic_fetch_key_fp;
+	dbctx->fetch_key_text		= db4_fetch_key_text;
+	dbctx->fetch_key_skshash	= db4_fetch_key_skshash;
+	dbctx->store_key		= db4_store_key;
+	dbctx->update_keys		= generic_update_keys;
+	dbctx->delete_key		= db4_delete_key;
+	dbctx->getkeysigs		= generic_getkeysigs;
+	dbctx->cached_getkeysigs	= generic_cached_getkeysigs;
+	dbctx->keyid2uid		= generic_keyid2uid;
+	dbctx->getfullkeyid		= db4_getfullkeyid;
+	dbctx->iterate_keys		= db4_iterate_keys;
+
+	return dbctx;
+}