Fix assumption that a signature on a public key is a revocation

[onak.git] / keydb_db2.c

diff --git a/keydb_db2.c b/keydb_db2.c
index 0c597c4b1b1e00584db0c6ebdf7ee50f370ac178..affdc4b147682c55ab739d432c91283a695645db 100644 (file)
--- a/keydb_db2.c
+++ b/keydb_db2.c
@@ -3,7 +3,7 @@
  *
  * Jonathan McDowell <noodles@earth.li>
  *
  *
  * Jonathan McDowell <noodles@earth.li>
  *

- * Copyright 2002 Project Purple
+ * Copyright 2002-2004 Project Purple

  */
 
 #include <sys/types.h>
  */
 
 #include <sys/types.h>


@@ -63,12 +63,26 @@ DB *keydb(DBT *key)
  *     this file are called in order to allow the DB to be initialized ready
  *     for access.
  */
  *     this file are called in order to allow the DB to be initialized ready
  *     for access.
  */

-void initdb(void)
+void initdb(bool readonly)

 {
        DB_INFO keydbinfo;
        int i;
        int ret;
        char keydbname[20];
 {
        DB_INFO keydbinfo;
        int i;
        int ret;
        char keydbname[20];

+       char buf[1024];
+       FILE *numdb = 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) {
+                       db2_numdb = atoi(buf);
+               }
+               fclose(numdb);
+       } else {
+               logthing(LOGTHING_ERROR, "Couldn't open num_keydb: %s",
+                               strerror(errno));
+       }

 
        memset(&db2_env, 0, sizeof(db2_env));
 
 
        memset(&db2_env, 0, sizeof(db2_env));
 


@@ -184,7 +198,7 @@ int fetch_key(uint64_t keyid, struct openpgp_publickey **publickey,
                fetchbuf.buffer = data.data;
                fetchbuf.offset = 0;
                fetchbuf.size = data.size;
                fetchbuf.buffer = data.data;
                fetchbuf.offset = 0;
                fetchbuf.size = data.size;

-               read_openpgp_stream(buffer_fetchchar, &fetchbuf, &packets);
+               read_openpgp_stream(buffer_fetchchar, &fetchbuf, &packets, 0);

                parse_keys(packets, publickey);
                free_packet_list(packets);
                packets = NULL;
                parse_keys(packets, publickey);
                free_packet_list(packets);
                packets = NULL;


@@ -235,10 +249,28 @@ int delete_key(uint64_t keyid, bool intrans)
        return (1);
 }
 
        return (1);
 }
 

+/**
+ *     iterate_keys - call a function once for each key in the db.
+ *     @iterfunc: The function to call.
+ *     @ctx: A context pointer
+ *
+ *     Calls iterfunc once for each key in the database. ctx is passed
+ *     unaltered to iterfunc. This function is intended to aid database dumps
+ *     and statistic calculations.
+ *
+ *     Returns the number of keys we iterated over.
+ */
+int iterate_keys(void (*iterfunc)(void *ctx, struct openpgp_publickey *key),
+               void *ctx)
+{
+       return 0;
+}
+

 /*
  * Include the basic keydb routines.
  */
 #define NEED_KEYID2UID 1
 #define NEED_GETKEYSIGS 1
 #define NEED_GETFULLKEYID 1
 /*
  * Include the basic keydb routines.
  */
 #define NEED_KEYID2UID 1
 #define NEED_GETKEYSIGS 1
 #define NEED_GETFULLKEYID 1

+#define NEED_UPDATEKEYS 1

 #include "keydb.c"
 #include "keydb.c"