X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/62078c1601192c2594b954a122ac44a0c319c9bd..1044f25379a43ce9cc5cd3b780abfdbcf49b06d5:/keydb_file.c?ds=inline

diff --git a/keydb_file.c b/keydb_file.c
index ba8dc2e..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>
@@ -81,13 +83,15 @@ int fetch_key(uint64_t keyid, 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,
 			keyid & 0xFFFFFFFF);
 	fd = open(keyfile, O_RDONLY); // | O_SHLOCK);
 
 	if (fd > -1) {
 		read_openpgp_stream(file_fetchchar, &fd, &packets);
 		parse_keys(packets, publickey);
+		free_packet_list(packets);
+		packets = NULL;
 		close(fd);
 	}
 
@@ -113,7 +117,7 @@ int store_key(struct openpgp_publickey *publickey, bool intrans, bool update)
 	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);
 
@@ -125,6 +129,8 @@ int store_key(struct openpgp_publickey *publickey, bool intrans, bool update)
 		
 		write_openpgp_stream(file_putchar, &fd, packets);
 		close(fd);
+		free_packet_list(packets);
+		packets = NULL;
 	}
 
 	return (fd > -1);
@@ -142,7 +148,7 @@ 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);
@@ -163,6 +169,21 @@ 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.
  */