cscvs to tla changeset 59

[onak.git] / keydb_db2.c

diff --git a/keydb_db2.c b/keydb_db2.c
index 3d66c5a18ca0095f0bcebd565c317dbc6504ed00..0c597c4b1b1e00584db0c6ebdf7ee50f370ac178 100644 (file)
--- a/keydb_db2.c
+++ b/keydb_db2.c
@@ -16,10 +16,12 @@
 #include <string.h>
 #include <unistd.h>
 
+#include "charfuncs.h"
 #include "keydb.h"
 #include "keyid.h"
 #include "keyindex.h"
 #include "keystructs.h"
+#include "log.h"
 #include "mem.h"
 #include "onak-conf.h"
 #include "parsekey.h"
@@ -41,40 +43,6 @@ static DB **db2_keydbfiles = NULL;
  */
 static DB_ENV db2_env;
 
-/*
- * Shared with CGI buffer stuff...
- */
-struct db2_get_ctx {
-       char *buffer;
-       int offset;
-       int size;
-};
-
-/**
- *     keydb_fetchchar - Fetches a char from a buffer.
- */
-int keydb_fetchchar(void *ctx, int count, unsigned char *c)
-{
-       struct db2_get_ctx *buf = NULL;
-       int i;
-       
-       buf = (struct db2_get_ctx *) ctx;
-       for (i = 0; i < count; i++) {
-               c[i] = buf->buffer[buf->offset++];
-       }
-
-       return (((buf->offset) == (buf->size)) ? 1 : 0);
-}
-
-/**
- *     keydb_putchar - Puts a char to a file.
- */
-static int keydb_putchar(void *fd, unsigned char c)
-{
-//     return !(lo_write(dbconn, *(int *) fd, &c, sizeof(c)));
-       return 1;
-}
-
 DB *keydb(DBT *key)
 {
        /*
@@ -111,7 +79,7 @@ void initdb(void)
         */
        db2_env.mp_size = 20 * 1024 * 1024;
 
-       ret = db_appinit(config.db2_dbpath, NULL,
+       ret = db_appinit(config.db_dir, NULL,
                        &db2_env, DB_INIT_MPOOL|DB_INIT_LOCK);
        if (!ret) {
                db2_keydbfiles = (DB **) malloc(sizeof (DB *) * db2_numdb);
@@ -124,13 +92,15 @@ void initdb(void)
                                        &db2_env, &keydbinfo,
                                        &db2_keydbfiles[i]);
                        if (ret) {
-                               fprintf(stderr, "Error opening db file %d (errno %d)\n",
+                               logthing(LOGTHING_CRITICAL,
+                                       "Error opening db file %d (errno %d)",
                                        i, ret);
                                exit(1);
                        }
                }
        } else {
-               fprintf(stderr, "Error initializing db (%d).\n", ret);
+               logthing(LOGTHING_CRITICAL, "Error initializing db (%d).",
+                               ret);
                exit(1);
        }
 }
@@ -196,7 +166,7 @@ int fetch_key(uint64_t keyid, struct openpgp_publickey **publickey,
        int ret;
        DBT key, data;
        char id[KEYDB_KEYID_BYTES];
-       struct db2_get_ctx fetchbuf;
+       struct buffer_ctx fetchbuf;
 
        memset(&key, 0, sizeof(key));
        memset(&data, 0, sizeof(data));
@@ -214,8 +184,10 @@ int fetch_key(uint64_t keyid, struct openpgp_publickey **publickey,
                fetchbuf.buffer = data.data;
                fetchbuf.offset = 0;
                fetchbuf.size = data.size;
-               read_openpgp_stream(keydb_fetchchar, &fetchbuf, &packets);
+               read_openpgp_stream(buffer_fetchchar, &fetchbuf, &packets);
                parse_keys(packets, publickey);
+               free_packet_list(packets);
+               packets = NULL;
        }
 
        return (!ret);