X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/97b2d68b9debdeaec828c9000bcca60a4a3d5817..58d762ea573eb3cfea626bb52ea7a99e24b8a0aa:/keydb_db3.c

diff --git a/keydb_db3.c b/keydb_db3.c
index f686770..309a297 100644
--- a/keydb_db3.c
+++ b/keydb_db3.c
@@ -5,7 +5,7 @@
  *
  * Copyright 2002 Project Purple
  *
- * $Id: keydb_db3.c,v 1.19 2003/09/28 16:12:47 noodles Exp $
+ * $Id: keydb_db3.c,v 1.21 2003/10/03 23:02:04 noodles Exp $
  */
 
 #include <assert.h>
@@ -58,7 +58,11 @@ static DB_TXN *txn = NULL;
 
 DB *keydb(uint64_t keyid)
 {
-	return(dbconns[keyid % numdbs]);
+	uint64_t keytrun;
+
+	keytrun = keyid >> 8;
+
+	return(dbconns[keytrun % numdbs]);
 }
 
 /**
@@ -170,7 +174,7 @@ void initdb(void)
 			0);
 	if (ret != 0) {
 		logthing(LOGTHING_CRITICAL,
-				"Erroring opening db environment: %s (%s)",
+				"Error opening db environment: %s (%s)",
 				config.db_dir,
 				db_strerror(ret));
 		exit(1);
@@ -340,7 +344,7 @@ int fetch_key(uint64_t keyid, struct openpgp_publickey **publickey,
 		fetchbuf.offset = 0;
 		fetchbuf.size = data.size;
 		read_openpgp_stream(buffer_fetchchar, &fetchbuf,
-				&packets);
+				&packets, 0);
 		parse_keys(packets, publickey);
 		free_packet_list(packets);
 		packets = NULL;