X-Git-Url: https://the.earth.li/gitweb/?a=blobdiff_plain;f=keydb_pg.c;h=c643a79a57c38bd9e44305daec3af1a0282e6fee;hb=7b7cb978ab032edb192effcd9eac443d8800b565;hp=f1cd0092feb3669438a9b6726dedd2ac744ee2e2;hpb=34b03028378025ad22c8d29f70e81109cee690c2;p=onak.git

diff --git a/keydb_pg.c b/keydb_pg.c
index f1cd009..c643a79 100644
--- a/keydb_pg.c
+++ b/keydb_pg.c
@@ -4,6 +4,8 @@
  * Jonathan McDowell <noodles@earth.li>
  *
  * Copyright 2002 Project Purple
+ *
+ * $Id: keydb_pg.c,v 1.11 2003/06/05 07:32:00 noodles Exp $
  */
 
 #include <postgresql/libpq-fe.h>
@@ -23,8 +25,9 @@
 #include "hash.h"
 #include "keydb.h"
 #include "keyid.h"
-#include "keyindex.h"
+#include "decodekey.h"
 #include "keystructs.h"
+#include "log.h"
 #include "mem.h"
 #include "onak-conf.h"
 #include "parsekey.h"
@@ -68,8 +71,8 @@ void initdb(void)
 			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);
@@ -169,7 +172,8 @@ int fetch_key(uint64_t keyid, struct openpgp_publickey **publickey,
 
 			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,
 						&packets);
@@ -180,7 +184,7 @@ int fetch_key(uint64_t keyid, struct openpgp_publickey **publickey,
 			}
 		}
 	} 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);
@@ -235,7 +239,8 @@ int fetch_key_text(const char *search, struct openpgp_publickey **publickey)
 
 			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,
 						&packets);
@@ -246,7 +251,7 @@ int fetch_key_text(const char *search, struct openpgp_publickey **publickey)
 			}
 		}
 	} 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);
@@ -307,7 +312,7 @@ int store_key(struct openpgp_publickey *publickey, bool intrans, bool update)
 		
 	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);
@@ -324,8 +329,8 @@ int store_key(struct openpgp_publickey *publickey, bool intrans, bool update)
 	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);
 
@@ -356,8 +361,9 @@ int store_key(struct openpgp_publickey *publickey, bool intrans, bool update)
 			}
 
 			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));
 			}
 			/*
@@ -445,7 +451,8 @@ int delete_key(uint64_t keyid, bool intrans)
 			keyid);
 		result = PQexec(dbconn, statement);
 	} 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);
 	}
 
@@ -484,7 +491,8 @@ char *keyid2uid(uint64_t keyid)
 			PQntuples(result) >= 1) {
 		uid = strdup(PQgetvalue(result, 0, 0));
 	} 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);
 	}
 
@@ -539,7 +547,7 @@ struct ll *getkeysigs(uint64_t keyid)
 			sigs = lladd(sigs, createandaddtohash(signer));
 		}
 	} 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);
@@ -551,6 +559,21 @@ struct ll *getkeysigs(uint64_t keyid)
 	return sigs;
 }
 
+/**
+ *	dumpdb - dump the key database
+ *	@filenamebase: The base filename to use for the dump.
+ *
+ *	Dumps the database into one or more files, which contain pure OpenPGP
+ *	that can be reimported into onak or gpg. filenamebase provides a base
+ *	file name for the dump; several files may be created, all of which will
+ *	begin with this string and then have a unique number and a .pgp
+ *	extension.
+ *          */
+int dumpdb(char *filenamebase)
+{
+	return 0;
+}
+
 /*
  * Include the basic keydb routines.
  */