cscvs to tla changeset 117

[onak.git] / keydb_db3.c

diff --git a/keydb_db3.c b/keydb_db3.c
index a50643d30769071e1ca097494ebb71c0427b0a95..b39c44dfb63c17928e76c75ae62d3bff717238a5 100644 (file)
--- a/keydb_db3.c
+++ b/keydb_db3.c
@@ -5,7 +5,7 @@
  *
  * Copyright 2002 Project Purple
  *
- * $Id: keydb_db3.c,v 1.18 2003/09/28 14:56:32 noodles Exp $
+ * $Id: keydb_db3.c,v 1.23 2004/03/23 12:33:46 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,7 +122,7 @@ 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;
@@ -135,6 +139,15 @@ void initdb(void)
        } else {
                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 +183,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 +353,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;
@@ -778,35 +791,46 @@ int delete_key(uint64_t keyid, bool intrans)
  */
 int dumpdb(char *filenamebase)
 {
-       DBT key, data;
-       DBC *cursor = NULL;
-       int ret = 0;
-       int fd = -1;
-       int i;
+       DBT   key, data;
+       DBC  *cursor = NULL;
+       int   ret = 0;
+       int   fd = -1;
+       int   i = 0;
+       char  filename[1024];
 
+       filename[1023] = 0;
        for (i = 0; i < numdbs; i++) {
                ret = dbconns[i]->cursor(dbconns[i],
                        NULL,
                        &cursor,
                        0);   /* flags */
 
-               fd = open(filenamebase, O_CREAT | O_WRONLY | O_TRUNC, 0640);
-               memset(&key, 0, sizeof(key));
-               memset(&data, 0, sizeof(data));
-               ret = cursor->c_get(cursor, &key, &data, DB_NEXT);
-               while (ret == 0) {
-                       write(fd, data.data, data.size);
+               snprintf(filename, 1023, "%s.%d.pgp", filenamebase, i);
+               fd = open(filename, O_CREAT | O_WRONLY | O_TRUNC, 0640);
+               if (fd == -1) {
+                       logthing(LOGTHING_ERROR,
+                               "Error opening keydump file (%s): %s",
+                               filename,
+                               strerror(errno));
+               } else {
                        memset(&key, 0, sizeof(key));
                        memset(&data, 0, sizeof(data));
                        ret = cursor->c_get(cursor, &key, &data, DB_NEXT);
-               }
-               if (ret != DB_NOTFOUND) {
-                       logthing(LOGTHING_ERROR, "Problem reading key: %s",
+                       while (ret == 0) {
+                               write(fd, data.data, data.size);
+                               memset(&key, 0, sizeof(key));
+                               memset(&data, 0, sizeof(data));
+                               ret = cursor->c_get(cursor, &key, &data,
+                                               DB_NEXT);
+                       }
+                       if (ret != DB_NOTFOUND) {
+                               logthing(LOGTHING_ERROR,
+                                       "Problem reading key: %s",
                                        db_strerror(ret));
+                       }
+                       close(fd);
                }
 
-               close(fd);
-
                ret = cursor->c_close(cursor);
                cursor = NULL;
        }