X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/8e58a1769ce5e492dd68904dfc81b6e077fc2a3a..cbd86744c2245a16a75c230733db23960cf19631:/keydb_file.c

diff --git a/keydb_file.c b/keydb_file.c
index 9784ecf..0ca39ae 100644
--- a/keydb_file.c
+++ b/keydb_file.c
@@ -4,6 +4,8 @@
  * Jonathan McDowell <noodles@earth.li>
  *
  * Copyright 2002 Project Purple
+ *
+ * $Id: keydb_file.c,v 1.9 2003/06/05 07:31:59 noodles Exp $
  */
 
 #include <sys/types.h>
@@ -15,52 +17,58 @@
 #include <string.h>
 #include <unistd.h>
 
+#include "charfuncs.h"
 #include "keydb.h"
 #include "keyid.h"
 #include "keystructs.h"
 #include "ll.h"
 #include "mem.h"
-#include "onak_conf.h"
+#include "onak-conf.h"
 #include "parsekey.h"
 
 /**
- *	keydb_fetchchar - Fetches a char from a file.
+ *	initdb - Initialize the key database.
+ *
+ *	This is just a no-op for flat file access.
  */
-static int keydb_fetchchar(void *fd, size_t count, unsigned char *c)
+void initdb(void)
 {
-	return !(read( *(int *) fd, c, count));
 }
 
 /**
- *	keydb_putchar - Puts a char to a file.
+ *	cleanupdb - De-initialize the key database.
+ *
+ *	This is just a no-op for flat file access.
  */
-static int keydb_putchar(void *fd, unsigned char c)
+void cleanupdb(void)
 {
-	return !(write( *(int *) fd, &c, sizeof(c)));
 }
 
 /**
- *	initdb - Initialize the key database.
+ *	starttrans - Start a transaction.
  *
  *	This is just a no-op for flat file access.
  */
-void initdb(void)
+bool starttrans(void)
 {
+	return true;
 }
 
 /**
- *	cleanupdb - De-initialize the key database.
+ *	endtrans - End a transaction.
  *
  *	This is just a no-op for flat file access.
  */
-void cleanupdb(void)
+void endtrans(void)
 {
+	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.
+ *	@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
@@ -68,19 +76,22 @@ void cleanupdb(void)
  *	in and then parse_keys() to parse the packets into a publickey
  *	structure.
  */
-int fetch_key(uint64_t keyid, struct openpgp_publickey **publickey)
+int fetch_key(uint64_t keyid, struct openpgp_publickey **publickey,
+		bool intrans)
 {
 	struct openpgp_packet_list *packets = NULL;
 	char keyfile[1024];
 	int fd = -1;
 
-	snprintf(keyfile, 1023, "%s/0x%llX", config.file_dbpath,
+	snprintf(keyfile, 1023, "%s/0x%llX", config.db_dir,
 			keyid & 0xFFFFFFFF);
 	fd = open(keyfile, O_RDONLY); // | O_SHLOCK);
 
 	if (fd > -1) {
-		read_openpgp_stream(keydb_fetchchar, &fd, &packets);
+		read_openpgp_stream(file_fetchchar, &fd, &packets);
 		parse_keys(packets, publickey);
+		free_packet_list(packets);
+		packets = NULL;
 		close(fd);
 	}
 
@@ -90,13 +101,15 @@ int fetch_key(uint64_t keyid, struct openpgp_publickey **publickey)
 /**
  *	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
  *	the file.
  */
-int store_key(struct openpgp_publickey *publickey)
+int store_key(struct openpgp_publickey *publickey, bool intrans, bool update)
 {
 	struct openpgp_packet_list *packets = NULL;
 	struct openpgp_packet_list *list_end = NULL;
@@ -104,7 +117,7 @@ int store_key(struct openpgp_publickey *publickey)
 	char keyfile[1024];
 	int fd = -1;
 
-	snprintf(keyfile, 1023, "%s/0x%llX", config.file_dbpath,
+	snprintf(keyfile, 1023, "%s/0x%llX", config.db_dir,
 			get_keyid(publickey) & 0xFFFFFFFF);
 	fd = open(keyfile, O_WRONLY | O_CREAT, 0664); // | O_EXLOCK);
 
@@ -114,8 +127,10 @@ int store_key(struct openpgp_publickey *publickey)
 		flatten_publickey(publickey, &packets, &list_end);
 		publickey -> next = next;
 		
-		write_openpgp_stream(keydb_putchar, &fd, packets);
+		write_openpgp_stream(file_putchar, &fd, packets);
 		close(fd);
+		free_packet_list(packets);
+		packets = NULL;
 	}
 
 	return (fd > -1);
@@ -124,23 +139,55 @@ int store_key(struct openpgp_publickey *publickey)
 /**
  *	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.
  */
-int delete_key(uint64_t keyid)
+int delete_key(uint64_t keyid, bool intrans)
 {
 	char keyfile[1024];
 
-	snprintf(keyfile, 1023, "%s/0x%llX", config.file_dbpath,
+	snprintf(keyfile, 1023, "%s/0x%llX", config.db_dir,
 			keyid & 0xFFFFFFFF);
 
 	return unlink(keyfile);
 }
 
+/**
+ *	fetch_key_text - Trys to find the keys that contain the supplied text.
+ *	@search: The text to search for.
+ *	@publickey: A pointer to a structure to return the key in.
+ *
+ *	This function searches for the supplied text and returns the keys that
+ *	contain it.
+ *
+ *	TODO: Write for flat file access. Some sort of grep?
+ */
+int fetch_key_text(const char *search, struct openpgp_publickey **publickey)
+{
+	return 0;
+}
+
+/**
+ *	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.
  */
 #define NEED_KEYID2UID 1
 #define NEED_GETKEYSIGS 1
+#define NEED_GETFULLKEYID 1
 #include "keydb.c"