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

diff --git a/keydb_db3.c b/keydb_db3.c
index f686770..e25b94e 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.25 2004/05/26 17:46:21 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]);
 }
 
 /**
@@ -118,12 +122,13 @@ struct ll *makewordlist(struct ll *wordlist, char *word)
  *	this file are called in order to allow the DB to be initialized ready
  *	for access.
  */
-void initdb(void)
+void initdb(bool readonly)
 {
-	char  buf[1024];
-	FILE *numdb = NULL;
-	int   ret = 0;
-	int   i = 0;
+	char       buf[1024];
+	FILE      *numdb = NULL;
+	int        ret = 0;
+	int        i = 0;
+	u_int32_t  flags = 0;
 
 	snprintf(buf, sizeof(buf) - 1, "%s/num_keydb", config.db_dir);
 	numdb = fopen(buf, "r");
@@ -132,9 +137,18 @@ void initdb(void)
 			numdbs = atoi(buf);
 		}
 		fclose(numdb);
-	} else {
+	} 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));
+		}
 	}
 
 	dbconns = malloc(sizeof (DB *) * numdbs);
@@ -170,7 +184,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);
@@ -185,10 +199,14 @@ void initdb(void)
 		}
 
 		snprintf(buf, 1023, "keydb.%d.db", i);
+		flags = DB_CREATE;
+		if (readonly) {
+			flags = DB_RDONLY;
+		}
 		ret = dbconns[i]->open(dbconns[i], buf,
 			NULL,
 			DB_HASH,
-			DB_CREATE,
+			flags,
 			0664);
 		if (ret != 0) {
 			logthing(LOGTHING_CRITICAL,
@@ -207,7 +225,7 @@ void initdb(void)
 	ret = worddb->set_flags(worddb, DB_DUP);
 
 	ret = worddb->open(worddb, "worddb", NULL, DB_BTREE,
-			DB_CREATE,
+			flags,
 			0664);
 	if (ret != 0) {
 		logthing(LOGTHING_CRITICAL,
@@ -340,7 +358,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;