Add -c option to specify keyd config file on command line

[onak.git] / keydb_pg.c

diff --git a/keydb_pg.c b/keydb_pg.c
index d2a2a55c5df6146e9c1f48af1b310b18ca4e57fc..85ea50060b5b12a58cad35badabb066d9d9043a8 100644 (file)
--- a/keydb_pg.c
+++ b/keydb_pg.c
@@ -3,14 +3,12 @@
  *
  * Jonathan McDowell <noodles@earth.li>
  *
  *
  * Jonathan McDowell <noodles@earth.li>
  *

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

  */
 
 #include <postgresql/libpq-fe.h>
 #include <postgresql/libpq/libpq-fs.h>
 
  */
 
 #include <postgresql/libpq-fe.h>
 #include <postgresql/libpq/libpq-fs.h>
 

-//#include <libpq-fe.h>
-//#include <libpq/libpq-fs.h>

 #include <sys/types.h>
 #include <sys/uio.h>
 #include <errno.h>
 #include <sys/types.h>
 #include <sys/uio.h>
 #include <errno.h>


@@ -20,12 +18,14 @@
 #include <string.h>
 #include <unistd.h>
 
 #include <string.h>
 #include <unistd.h>
 

+#include "hash.h"

 #include "keydb.h"
 #include "keyid.h"
 #include "keydb.h"
 #include "keyid.h"

-#include "keyindex.h"
+#include "decodekey.h"

 #include "keystructs.h"
 #include "keystructs.h"

+#include "log.h"

 #include "mem.h"
 #include "mem.h"

-#include "onak_conf.h"
+#include "onak-conf.h"

 #include "parsekey.h"
 
 /**
 #include "parsekey.h"
 
 /**


@@ -38,15 +38,15 @@ static PGconn *dbconn = NULL;
  */
 static int keydb_fetchchar(void *fd, size_t count, unsigned char *c)
 {
  */
 static int keydb_fetchchar(void *fd, size_t count, unsigned char *c)
 {

-       return (!lo_read(dbconn, *(int *) fd, c, count));
+       return (!lo_read(dbconn, *(int *) fd, (char *) c, count));

 }
 
 /**
  *     keydb_putchar - Puts a char to a file.
  */
 }
 
 /**
  *     keydb_putchar - Puts a char to a file.
  */

-static int keydb_putchar(void *fd, unsigned char c)
+static int keydb_putchar(void *fd, size_t count, unsigned char *c)

 {
 {

-       return !(lo_write(dbconn, *(int *) fd, &c, sizeof(c)));
+       return !(lo_write(dbconn, *(int *) fd, (char *) c, count));

 }
 
 /**
 }
 
 /**


@@ -56,7 +56,7 @@ static int keydb_putchar(void *fd, unsigned char c)
  *     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)
+static void pg_initdb(bool readonly)

 {
        dbconn = PQsetdbLogin(config.pg_dbhost, // host
                        NULL, // port
 {
        dbconn = PQsetdbLogin(config.pg_dbhost, // host
                        NULL, // port


@@ -67,8 +67,8 @@ void initdb(void)
                        config.pg_dbpass); // password
 
        if (PQstatus(dbconn) == CONNECTION_BAD) {
                        config.pg_dbpass); // password
 
        if (PQstatus(dbconn) == CONNECTION_BAD) {

-               fprintf(stderr, "Connection to database failed.\n");
-               fprintf(stderr, "%s\n", PQerrorMessage(dbconn));
+               logthing(LOGTHING_CRITICAL, "Connection to database failed.");
+               logthing(LOGTHING_CRITICAL, "%s", PQerrorMessage(dbconn));

                PQfinish(dbconn);
                dbconn = NULL;
                exit(1);
                PQfinish(dbconn);
                dbconn = NULL;
                exit(1);


@@ -81,16 +81,49 @@ void initdb(void)
  *     This function should be called upon program exit to allow the DB to
  *     cleanup after itself.
  */
  *     This function should be called upon program exit to allow the DB to
  *     cleanup after itself.
  */

-void cleanupdb(void)
+static void pg_cleanupdb(void)

 {
        PQfinish(dbconn);
        dbconn = NULL;
 }
 
 {
        PQfinish(dbconn);
        dbconn = NULL;
 }
 

+/**
+ *     starttrans - Start a transaction.
+ *
+ *     Start a transaction. Intended to be used if we're about to perform many
+ *     operations on the database to help speed it all up, or if we want
+ *     something to only succeed if all relevant operations are successful.
+ */
+static bool pg_starttrans(void)
+{
+       PGresult *result = NULL;
+       
+       result = PQexec(dbconn, "BEGIN");
+       PQclear(result);
+
+       return true;
+}
+
+/**
+ *     endtrans - End a transaction.
+ *
+ *     Ends a transaction.
+ */
+static void pg_endtrans(void)
+{
+       PGresult *result = NULL;
+
+       result = PQexec(dbconn, "COMMIT");
+       PQclear(result);
+
+       return;
+}
+

 /**
  *     fetch_key - Given a keyid fetch the key from storage.
  *     @keyid: The keyid to fetch.
  *     @publickey: A pointer to a structure to return the key in.
 /**
  *     fetch_key - Given a keyid fetch the key from storage.
  *     @keyid: The keyid to fetch.
  *     @publickey: A pointer to a structure to return the key in.

+ *     @intrans: If we're already in a transaction.

  *
  *     We use the hex representation of the keyid as the filename to fetch the
  *     key from. The key is stored in the file as a binary OpenPGP stream of
  *
  *     We use the hex representation of the keyid as the filename to fetch the
  *     key from. The key is stored in the file as a binary OpenPGP stream of


@@ -98,7 +131,8 @@ void cleanupdb(void)
  *     in and then parse_keys() to parse the packets into a publickey
  *     structure.
  */
  *     in and then parse_keys() to parse the packets into a publickey
  *     structure.
  */

-int fetch_key(uint64_t keyid, struct openpgp_publickey **publickey)
+static int pg_fetch_key(uint64_t keyid, struct openpgp_publickey **publickey,
+               bool intrans)

 {
        struct openpgp_packet_list *packets = NULL;
        PGresult *result = NULL;
 {
        struct openpgp_packet_list *packets = NULL;
        PGresult *result = NULL;


@@ -109,8 +143,10 @@ int fetch_key(uint64_t keyid, struct openpgp_publickey **publickey)
        int numkeys = 0;
        Oid key_oid;
 
        int numkeys = 0;
        Oid key_oid;
 

-       result = PQexec(dbconn, "BEGIN");
-       PQclear(result);
+       if (!intrans) {
+               result = PQexec(dbconn, "BEGIN");
+               PQclear(result);
+       }

        
        if (keyid > 0xFFFFFFFF) {
                snprintf(statement, 1023,
        
        if (keyid > 0xFFFFFFFF) {
                snprintf(statement, 1023,


@@ -132,22 +168,27 @@ int fetch_key(uint64_t keyid, struct openpgp_publickey **publickey)
 
                        fd = lo_open(dbconn, key_oid, INV_READ);
                        if (fd < 0) {
 
                        fd = lo_open(dbconn, key_oid, INV_READ);
                        if (fd < 0) {

-                               fprintf(stderr, "Can't open large object.\n");
+                               logthing(LOGTHING_ERROR,
+                                               "Can't open large object.");

                        } else {
                                read_openpgp_stream(keydb_fetchchar, &fd,
                        } else {
                                read_openpgp_stream(keydb_fetchchar, &fd,

-                                               &packets);
+                                               &packets, 0);

                                parse_keys(packets, publickey);
                                lo_close(dbconn, fd);
                                parse_keys(packets, publickey);
                                lo_close(dbconn, fd);

+                               free_packet_list(packets);
+                               packets = NULL;

                        }
                }
        } else if (PQresultStatus(result) != PGRES_TUPLES_OK) {
                        }
                }
        } else if (PQresultStatus(result) != PGRES_TUPLES_OK) {

-               fprintf(stderr, "Problem retrieving key from DB.\n");
+               logthing(LOGTHING_ERROR, "Problem retrieving key from DB.");

        }
 
        PQclear(result);
 
        }
 
        PQclear(result);
 

-       result = PQexec(dbconn, "COMMIT");
-       PQclear(result);
+       if (!intrans) {
+               result = PQexec(dbconn, "COMMIT");
+               PQclear(result);
+       }

        return (numkeys);
 }
 
        return (numkeys);
 }
 


@@ -159,7 +200,8 @@ int fetch_key(uint64_t keyid, struct openpgp_publickey **publickey)
  *     This function searches for the supplied text and returns the keys that
  *     contain it.
  */
  *     This function searches for the supplied text and returns the keys that
  *     contain it.
  */

-int fetch_key_text(const char *search, struct openpgp_publickey **publickey)
+static int pg_fetch_key_text(const char *search,
+               struct openpgp_publickey **publickey)

 {
        struct openpgp_packet_list *packets = NULL;
        PGresult *result = NULL;
 {
        struct openpgp_packet_list *packets = NULL;
        PGresult *result = NULL;


@@ -169,34 +211,22 @@ int fetch_key_text(const char *search, struct openpgp_publickey **publickey)
        int i = 0;
        int numkeys = 0;
        Oid key_oid;
        int i = 0;
        int numkeys = 0;
        Oid key_oid;

-       char *dodgychar = NULL;
+       char *newsearch = NULL;

 
        result = PQexec(dbconn, "BEGIN");
        PQclear(result);
 
 
        result = PQexec(dbconn, "BEGIN");
        PQclear(result);
 

-       /*
-        * TODO: We really want to use PQescapeString, but this isn't supported
-        * by the version of Postgresql in Debian Stable. Roll on Woody and for
-        * now kludge it.
-        */
-       dodgychar = strchr(search, '\'');
-       while (dodgychar != NULL) {
-               *dodgychar = ' ';
-               dodgychar = strchr(search, '\'');
-       }
-       dodgychar = strchr(search, '\\');
-       while (dodgychar != NULL) {
-               *dodgychar = ' ';
-               dodgychar = strchr(search, '\\');
-       }
-
-       
+       newsearch = malloc(strlen(search) * 2 + 1);
+       memset(newsearch, 0, strlen(search) * 2 + 1);
+       PQescapeStringConn(dbconn, newsearch, search, strlen(search), NULL);

        snprintf(statement, 1023,
                        "SELECT DISTINCT onak_keys.keydata FROM onak_keys, "
                        "onak_uids WHERE onak_keys.keyid = onak_uids.keyid "
                        "AND onak_uids.uid LIKE '%%%s%%'",
        snprintf(statement, 1023,
                        "SELECT DISTINCT onak_keys.keydata FROM onak_keys, "
                        "onak_uids WHERE onak_keys.keyid = onak_uids.keyid "
                        "AND onak_uids.uid LIKE '%%%s%%'",

-                       search);
+                       newsearch);

        result = PQexec(dbconn, statement);
        result = PQexec(dbconn, statement);

+       free(newsearch);
+       newsearch = NULL;

 
        if (PQresultStatus(result) == PGRES_TUPLES_OK) {
                numkeys = PQntuples(result);
 
        if (PQresultStatus(result) == PGRES_TUPLES_OK) {
                numkeys = PQntuples(result);


@@ -206,16 +236,20 @@ int fetch_key_text(const char *search, struct openpgp_publickey **publickey)
 
                        fd = lo_open(dbconn, key_oid, INV_READ);
                        if (fd < 0) {
 
                        fd = lo_open(dbconn, key_oid, INV_READ);
                        if (fd < 0) {

-                               fprintf(stderr, "Can't open large object.\n");
+                               logthing(LOGTHING_ERROR,
+                                               "Can't open large object.");

                        } else {
                                read_openpgp_stream(keydb_fetchchar, &fd,
                        } else {
                                read_openpgp_stream(keydb_fetchchar, &fd,

-                                               &packets);
+                                               &packets,
+                                               0);

                                parse_keys(packets, publickey);
                                lo_close(dbconn, fd);
                                parse_keys(packets, publickey);
                                lo_close(dbconn, fd);

+                               free_packet_list(packets);
+                               packets = NULL;

                        }
                }
        } else if (PQresultStatus(result) != PGRES_TUPLES_OK) {
                        }
                }
        } else if (PQresultStatus(result) != PGRES_TUPLES_OK) {

-               fprintf(stderr, "Problem retrieving key from DB.\n");
+               logthing(LOGTHING_ERROR, "Problem retrieving key from DB.");

        }
 
        PQclear(result);
        }
 
        PQclear(result);


@@ -225,29 +259,107 @@ int fetch_key_text(const char *search, struct openpgp_publickey **publickey)
        return (numkeys);
 }
 
        return (numkeys);
 }
 

+/**
+ *     delete_key - Given a keyid delete the key from storage.
+ *     @keyid: The keyid to delete.
+ *     @intrans: If we're already in a transaction.
+ *
+ *     This function deletes a public key from whatever storage mechanism we
+ *     are using. Returns 0 if the key existed.
+ */
+static int pg_delete_key(uint64_t keyid, bool intrans)
+{
+       PGresult *result = NULL;
+       char *oids = NULL;
+       char statement[1024];
+       int found = 1;
+       int i;
+       Oid key_oid;
+
+       if (!intrans) {
+               result = PQexec(dbconn, "BEGIN");
+               PQclear(result);
+       }
+       
+       snprintf(statement, 1023,
+                       "SELECT keydata FROM onak_keys WHERE keyid = '%llX'",
+                       keyid);
+       result = PQexec(dbconn, statement);
+
+       if (PQresultStatus(result) == PGRES_TUPLES_OK) {
+               found = 0;
+               i = PQntuples(result);
+               while (i > 0) {
+                       oids = PQgetvalue(result, i-1, 0);
+                       key_oid = (Oid) atoi(oids);
+                       lo_unlink(dbconn, key_oid);
+                       i--;
+               }
+               PQclear(result);
+
+               snprintf(statement, 1023,
+                       "DELETE FROM onak_keys WHERE keyid = '%llX'",
+                       keyid);
+               result = PQexec(dbconn, statement);
+               PQclear(result);
+
+               snprintf(statement, 1023,
+                       "DELETE FROM onak_sigs WHERE signee = '%llX'",
+                       keyid);
+               result = PQexec(dbconn, statement);
+               PQclear(result);
+
+               snprintf(statement, 1023,
+                       "DELETE FROM onak_uids WHERE keyid = '%llX'",
+                       keyid);
+               result = PQexec(dbconn, statement);
+       } else if (PQresultStatus(result) != PGRES_TUPLES_OK) {
+               logthing(LOGTHING_ERROR,
+                               "Problem retrieving key (%llX) from DB.",
+                               keyid);
+       }
+
+       PQclear(result);
+
+       if (!intrans) {
+               result = PQexec(dbconn, "COMMIT");
+               PQclear(result);
+       }
+       return (found);
+}
+

 /**
  *     store_key - Takes a key and stores it.
  *     @publickey: A pointer to the public key to store.
 /**
  *     store_key - Takes a key and stores it.
  *     @publickey: A pointer to the public key to store.

+ *     @intrans: If we're already in a transaction.
+ *     @update: If true the key exists and should be updated.

  *
  *     Again we just use the hex representation of the keyid as the filename
  *     to store the key to. We flatten the public key to a list of OpenPGP
  *     packets and then use write_openpgp_stream() to write the stream out to
  *
  *     Again we just use the hex representation of the keyid as the filename
  *     to store the key to. We flatten the public key to a list of OpenPGP
  *     packets and then use write_openpgp_stream() to write the stream out to

- *     the file.
+ *     the file. If update is true then we delete the old key first, otherwise
+ *     we trust that it doesn't exist.

  */
  */

-int store_key(struct openpgp_publickey *publickey)
+static int pg_store_key(struct openpgp_publickey *publickey, bool intrans,
+               bool update)

 {
        struct openpgp_packet_list *packets = NULL;
        struct openpgp_packet_list *list_end = NULL;
        struct openpgp_publickey *next = NULL;
 {
        struct openpgp_packet_list *packets = NULL;
        struct openpgp_packet_list *list_end = NULL;
        struct openpgp_publickey *next = NULL;

+       struct openpgp_signedpacket_list *curuid = NULL;

        PGresult *result = NULL;
        char statement[1024];
        Oid key_oid;
        int fd;
        char **uids = NULL;
        char *primary = NULL;
        PGresult *result = NULL;
        char statement[1024];
        Oid key_oid;
        int fd;
        char **uids = NULL;
        char *primary = NULL;

-       char *dodgychar = NULL;
+       char *safeuid = NULL;

        int i;
 
        int i;
 

+       if (!intrans) {
+               result = PQexec(dbconn, "BEGIN");
+               PQclear(result);
+       }

 
        /*
         * Delete the key if we already have it.
 
        /*
         * Delete the key if we already have it.


@@ -257,10 +369,9 @@ int store_key(struct openpgp_publickey *publickey)
         * of difference though - the largest chunk of data is the keydata and
         * it definitely needs updated.
         */
         * of difference though - the largest chunk of data is the keydata and
         * it definitely needs updated.
         */

-       delete_key(get_keyid(publickey));
-
-       result = PQexec(dbconn, "BEGIN");
-       PQclear(result);
+       if (update) {
+               pg_delete_key(get_keyid(publickey), true);
+       }

 
        next = publickey->next;
        publickey->next = NULL;
 
        next = publickey->next;
        publickey->next = NULL;


@@ -269,12 +380,14 @@ int store_key(struct openpgp_publickey *publickey)
                
        key_oid = lo_creat(dbconn, INV_READ | INV_WRITE);
        if (key_oid == 0) {
                
        key_oid = lo_creat(dbconn, INV_READ | INV_WRITE);
        if (key_oid == 0) {

-               fprintf(stderr, "Can't create key OID\n");
+               logthing(LOGTHING_ERROR, "Can't create key OID");

        } else {
                fd = lo_open(dbconn, key_oid, INV_WRITE);
                write_openpgp_stream(keydb_putchar, &fd, packets);
                lo_close(dbconn, fd);
        }
        } else {
                fd = lo_open(dbconn, key_oid, INV_WRITE);
                write_openpgp_stream(keydb_putchar, &fd, packets);
                lo_close(dbconn, fd);
        }

+       free_packet_list(packets);
+       packets = NULL;

 
        snprintf(statement, 1023, 
                        "INSERT INTO onak_keys (keyid, keydata) VALUES "
 
        snprintf(statement, 1023, 
                        "INSERT INTO onak_keys (keyid, keydata) VALUES "


@@ -284,41 +397,41 @@ int store_key(struct openpgp_publickey *publickey)
        result = PQexec(dbconn, statement);
 
        if (PQresultStatus(result) != PGRES_COMMAND_OK) {
        result = PQexec(dbconn, statement);
 
        if (PQresultStatus(result) != PGRES_COMMAND_OK) {

-               fprintf(stderr, "Problem storing key in DB.\n");
-               fprintf(stderr, "%s\n", PQresultErrorMessage(result));
+               logthing(LOGTHING_ERROR, "Problem storing key in DB.");
+               logthing(LOGTHING_ERROR, "%s", PQresultErrorMessage(result));

        }
        PQclear(result);
 
        uids = keyuids(publickey, &primary);
        if (uids != NULL) {
                for (i = 0; uids[i] != NULL; i++) {
        }
        PQclear(result);
 
        uids = keyuids(publickey, &primary);
        if (uids != NULL) {
                for (i = 0; uids[i] != NULL; i++) {

-                       /*
-                        * TODO: We really want to use PQescapeString, but this
-                        * isn't supported by the version of Postgresql in
-                        * Debian Stable. Roll on Woody and for now kludge it.
-                        */
-                       dodgychar = strchr(uids[i], '\'');
-                       while (dodgychar != NULL) {
-                               *dodgychar = ' ';
-                               dodgychar = strchr(uids[i], '\'');
+                       safeuid = malloc(strlen(uids[i]) * 2 + 1);
+                       if (safeuid != NULL) {
+                               memset(safeuid, 0, strlen(uids[i]) * 2 + 1);
+                               PQescapeStringConn(dbconn, safeuid, uids[i],
+                                               strlen(uids[i]), NULL);
+
+                               snprintf(statement, 1023,
+                                       "INSERT INTO onak_uids "
+                                       "(keyid, uid, pri) "
+                                       "VALUES ('%llX', '%s', '%c')",
+                                       get_keyid(publickey),
+                                       safeuid,
+                                       (uids[i] == primary) ? 't' : 'f');
+                               result = PQexec(dbconn, statement);
+
+                               free(safeuid);
+                               safeuid = NULL;

                        }
                        }

-                       dodgychar = strchr(uids[i], '\\');
-                               while (dodgychar != NULL) {
-                               *dodgychar = ' ';
-                               dodgychar = strchr(uids[i], '\\');
+                       if (uids[i] != NULL) {
+                               free(uids[i]);
+                               uids[i] = NULL;

                        }
 
                        }
 

-                       snprintf(statement, 1023,
-                               "INSERT INTO onak_uids (keyid, uid, pri) "
-                               "VALUES ('%llX', '%s', '%c')",
-                               get_keyid(publickey),
-                               uids[i],
-                               (uids[i] == primary) ? 't' : 'f');
-                       result = PQexec(dbconn, statement);
-

                        if (PQresultStatus(result) != PGRES_COMMAND_OK) {
                        if (PQresultStatus(result) != PGRES_COMMAND_OK) {

-                               fprintf(stderr, "Problem storing key in DB.\n");
-                               fprintf(stderr, "%s\n",
+                               logthing(LOGTHING_ERROR,
+                                               "Problem storing key in DB.");
+                               logthing(LOGTHING_ERROR, "%s",

                                                PQresultErrorMessage(result));
                        }
                        /*
                                                PQresultErrorMessage(result));
                        }
                        /*


@@ -326,108 +439,215 @@ int store_key(struct openpgp_publickey *publickey)
                         */
                        PQclear(result);
                }
                         */
                        PQclear(result);
                }

+               free(uids);
+               uids = NULL;

        }
 
        }
 

-       result = PQexec(dbconn, "COMMIT");
-       PQclear(result);
+       for (curuid = publickey->uids; curuid != NULL; curuid = curuid->next) {
+               for (packets = curuid->sigs; packets != NULL; 
+                               packets = packets->next) {
+                       snprintf(statement, 1023,
+                               "INSERT INTO onak_sigs (signer, signee) "
+                               "VALUES ('%llX', '%llX')",
+                               sig_keyid(packets->packet),
+                               get_keyid(publickey));
+                       result = PQexec(dbconn, statement);
+                       PQclear(result);
+               }
+       }
+
+       if (!intrans) {
+               result = PQexec(dbconn, "COMMIT");
+               PQclear(result);
+       }

        
        return 0;
 }
 
 /**
        
        return 0;
 }
 
 /**

- *     delete_key - Given a keyid delete the key from storage.
- *     @keyid: The keyid to delete.
- *
- *     This function deletes a public key from whatever storage mechanism we
- *     are using. Returns 0 if the key existed.
+ *     keyid2uid - Takes a keyid and returns the primary UID for it.
+ *     @keyid: The keyid to lookup.

  */
  */

-int delete_key(uint64_t keyid)
+static char *pg_keyid2uid(uint64_t keyid)

 {
        PGresult *result = NULL;
 {
        PGresult *result = NULL;

-       char *oids = NULL;

        char statement[1024];
        char statement[1024];

-       int found = 1;
-       int i;
-       Oid key_oid;
+       char *uid = NULL;

 
 

-       result = PQexec(dbconn, "BEGIN");
-       PQclear(result);
-       

        snprintf(statement, 1023,
        snprintf(statement, 1023,

-                       "SELECT keydata FROM onak_keys WHERE keyid = '%llX'",
-                       keyid);
+               "SELECT uid FROM onak_uids WHERE keyid = '%llX' AND pri = 't'",
+               keyid);

        result = PQexec(dbconn, statement);
 
        result = PQexec(dbconn, statement);
 

-       if (PQresultStatus(result) == PGRES_TUPLES_OK) {
-               found = 0;
-               i = PQntuples(result);
-               while (i > 0) {
-                       oids = PQgetvalue(result, i-1, 0);
-                       key_oid = (Oid) atoi(oids);
-                       lo_unlink(dbconn, key_oid);
-                       i--;
-               }
-               PQclear(result);
-
-               snprintf(statement, 1023,
-                       "DELETE FROM onak_keys WHERE keyid = '%llX'",
-                       keyid);
-               result = PQexec(dbconn, statement);
-               PQclear(result);
-
-               snprintf(statement, 1023,
-                       "DELETE FROM onak_uids WHERE keyid = '%llX'",
-                       keyid);
-               result = PQexec(dbconn, statement);
+       /*
+        * Technically we only expect one response to the query; a key only has
+        * one primary ID. Better to return something than nothing though.
+        *
+        * TODO: Log if we get more than one response? Needs logging framework
+        * first though.
+        */
+       if (PQresultStatus(result) == PGRES_TUPLES_OK &&
+                       PQntuples(result) >= 1) {
+               uid = strdup(PQgetvalue(result, 0, 0));

        } else if (PQresultStatus(result) != PGRES_TUPLES_OK) {
        } else if (PQresultStatus(result) != PGRES_TUPLES_OK) {

-               fprintf(stderr, "Problem retrieving key (%llX) from DB.\n",
+               logthing(LOGTHING_ERROR,
+                               "Problem retrieving key (%llX) from DB.",

                                keyid);
        }
 
        PQclear(result);
 
                                keyid);
        }
 
        PQclear(result);
 

-       result = PQexec(dbconn, "COMMIT");
-       PQclear(result);
-       return (found);
+       return uid;

 }
 
 /**
 }
 
 /**

- *     keyid2uid - Takes a keyid and returns the primary UID for it.
- *     @keyid: The keyid to lookup.
+ *     getkeysigs - Gets a linked list of the signatures on a key.
+ *     @keyid: The keyid to get the sigs for.
+ *     @revoked: If the key is revoked.
+ *
+ *     This function gets the list of signatures on a key. Used for key 
+ *     indexing and doing stats bits.

  */
  */

-char *keyid2uid(uint64_t keyid)
+static struct ll *pg_getkeysigs(uint64_t keyid, bool *revoked)

 {
 {

+       struct ll *sigs = NULL;

        PGresult *result = NULL;
        PGresult *result = NULL;

+       uint64_t signer;

        char statement[1024];
        char statement[1024];

-       char *uid = NULL;
+       int i, j;
+       int numsigs = 0;
+       bool intrans = false;
+       char *str;
+
+       if (!intrans) {
+               result = PQexec(dbconn, "BEGIN");
+               PQclear(result);
+       }

 
        snprintf(statement, 1023,
 
        snprintf(statement, 1023,

-               "SELECT uid FROM onak_uids WHERE keyid = '%llX' AND pri = 't'",
+               "SELECT DISTINCT signer FROM onak_sigs WHERE signee = '%llX'",

                keyid);
        result = PQexec(dbconn, statement);
 
                keyid);
        result = PQexec(dbconn, statement);
 

+       if (PQresultStatus(result) == PGRES_TUPLES_OK) {
+               numsigs = PQntuples(result);
+               for (i = 0; i < numsigs;  i++) {
+                       j = 0;
+                       signer = 0;
+                       str = PQgetvalue(result, i, 0);
+                       while (str[j] != 0) {
+                               signer <<= 4;
+                               if (str[j] >= '0' && str[j] <= '9') {
+                                       signer += str[j] - '0';
+                               } else {
+                                       signer += str[j] - 'A' + 10;
+                               }
+                               j++;
+                       }
+                       sigs = lladd(sigs, createandaddtohash(signer));
+               }
+       } else if (PQresultStatus(result) != PGRES_TUPLES_OK) {
+               logthing(LOGTHING_ERROR, "Problem retrieving key from DB.");
+       }
+
+       PQclear(result);
+
+       if (!intrans) {
+               result = PQexec(dbconn, "COMMIT");
+               PQclear(result);
+       }
+

        /*
        /*

-        * Technically we only expect one response to the query; a key only has
-        * one primary ID. Better to return something than nothing though.
-        *
-        * TODO: Log if we get more than one response? Needs logging framework
-        * first though.
+        * TODO: What do we do about revocations? We don't have the details
+        * stored in a separate table, so we'd have to grab the key and decode
+        * it, which we're trying to avoid by having a signers table.

         */
         */

-       if (PQresultStatus(result) == PGRES_TUPLES_OK &&
-                       PQntuples(result) >= 1) {
-               uid = strdup(PQgetvalue(result, 0, 0));
+       if (revoked != NULL) {
+               *revoked = false;
+       }
+       
+       return sigs;
+}
+
+/**
+ *     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.
+ */
+static int pg_iterate_keys(void (*iterfunc)(void *ctx,
+               struct openpgp_publickey *key), void *ctx)
+{
+       struct openpgp_packet_list *packets = NULL;
+       struct openpgp_publickey *key = NULL;
+       PGresult *result = NULL;
+       char *oids = NULL;
+       char statement[1024];
+       int fd = -1;
+       int i = 0;
+       int numkeys = 0;
+       Oid key_oid;
+
+       result = PQexec(dbconn, "SELECT keydata FROM onak_keys;");
+
+       if (PQresultStatus(result) == PGRES_TUPLES_OK) {
+               numkeys = PQntuples(result);
+               for (i = 0; i < numkeys; i++) {
+                       oids = PQgetvalue(result, i, 0);
+                       key_oid = (Oid) atoi(oids);
+
+                       fd = lo_open(dbconn, key_oid, INV_READ);
+                       if (fd < 0) {
+                               logthing(LOGTHING_ERROR,
+                                               "Can't open large object.");
+                       } else {
+                               read_openpgp_stream(keydb_fetchchar, &fd,
+                                               &packets, 0);
+                               parse_keys(packets, &key);
+                               lo_close(dbconn, fd);
+
+                               iterfunc(ctx, key);
+                                       
+                               free_publickey(key);
+                               key = NULL;
+                               free_packet_list(packets);
+                               packets = NULL;
+                       }
+               }

        } else if (PQresultStatus(result) != PGRES_TUPLES_OK) {
        } else if (PQresultStatus(result) != PGRES_TUPLES_OK) {

-               fprintf(stderr, "Problem retrieving key (%llX) from DB.\n",
-                               keyid);
+               logthing(LOGTHING_ERROR, "Problem retrieving key from DB.");

        }
 
        PQclear(result);
 
        }
 
        PQclear(result);
 

-       return uid;
+       return (numkeys);

 }
 
 /*
  * Include the basic keydb routines.
  */
 }
 
 /*
  * Include the basic keydb routines.
  */

-#define NEED_GETKEYSIGS 1
+#define NEED_GETFULLKEYID 1
+#define NEED_UPDATEKEYS 1

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

+
+struct dbfuncs keydb_pg_funcs = {
+       .initdb                 = pg_initdb,
+       .cleanupdb              = pg_cleanupdb,
+       .starttrans             = pg_starttrans,
+       .endtrans               = pg_endtrans,
+       .fetch_key              = pg_fetch_key,
+       .fetch_key_text         = pg_fetch_key_text,
+       .store_key              = pg_store_key,
+       .update_keys            = generic_update_keys,
+       .delete_key             = pg_delete_key,
+       .getkeysigs             = pg_getkeysigs,
+       .cached_getkeysigs      = generic_cached_getkeysigs,
+       .keyid2uid              = pg_keyid2uid,
+       .getfullkeyid           = generic_getfullkeyid,
+       .iterate_keys           = pg_iterate_keys,
+};