return(dbconns[keytrun % numdbs]);
}
+/**
+ * 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 db4_starttrans(void)
+{
+ int ret;
+
+ log_assert(dbenv != NULL);
+ log_assert(txn == NULL);
+
+ ret = dbenv->txn_begin(dbenv,
+ NULL, /* No parent transaction */
+ &txn,
+ 0);
+ if (ret != 0) {
+ logthing(LOGTHING_CRITICAL,
+ "Error starting transaction: %s",
+ db_strerror(ret));
+ exit(1);
+ }
+
+ return true;
+}
+
+/**
+ * endtrans - End a transaction.
+ *
+ * Ends a transaction.
+ */
+static void db4_endtrans(void)
+{
+ int ret;
+
+ log_assert(dbenv != NULL);
+ log_assert(txn != NULL);
+
+ ret = txn->commit(txn,
+ 0);
+ if (ret != 0) {
+ logthing(LOGTHING_CRITICAL,
+ "Error ending transaction: %s",
+ db_strerror(ret));
+ exit(1);
+ }
+ txn = NULL;
+
+ return;
+}
+
/**
* initdb - Initialize the key database.
*
* this file are called in order to allow the DB to be initialized ready
* for access.
*/
-void initdb(bool readonly)
+static void db4_initdb(bool readonly)
{
char buf[1024];
FILE *numdb = NULL;
"Error opening db environment: %s (%s)",
config.db_dir,
db_strerror(ret));
+ dbenv->close(dbenv, 0);
+ dbenv = NULL;
}
}
if (ret == 0) {
- starttrans();
+ db4_starttrans();
for (i = 0; !ret && i < numdbs; i++) {
ret = db_create(&dbconns[i], dbenv, 0);
* This function should be called upon program exit to allow the DB to
* cleanup after itself.
*/
-void cleanupdb(void)
+static void db4_cleanupdb(void)
{
int i = 0;
dbconns[i] = NULL;
}
}
+ free(dbconns);
+ dbconns = NULL;
dbenv->close(dbenv, 0);
dbenv = 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.
- */
-bool starttrans(void)
-{
- int ret;
-
- log_assert(dbenv != NULL);
- log_assert(txn == NULL);
-
- ret = dbenv->txn_begin(dbenv,
- NULL, /* No parent transaction */
- &txn,
- 0);
- if (ret != 0) {
- logthing(LOGTHING_CRITICAL,
- "Error starting transaction: %s",
- db_strerror(ret));
- exit(1);
- }
-
- return true;
-}
-
-/**
- * endtrans - End a transaction.
- *
- * Ends a transaction.
- */
-void endtrans(void)
-{
- int ret;
-
- log_assert(dbenv != NULL);
- log_assert(txn != NULL);
-
- ret = txn->commit(txn,
- 0);
- if (ret != 0) {
- logthing(LOGTHING_CRITICAL,
- "Error ending transaction: %s",
- db_strerror(ret));
- exit(1);
- }
- txn = NULL;
-
- return;
-}
-
/**
* fetch_key - Given a keyid fetch the key from storage.
* @keyid: The keyid to fetch.
* 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 db4_fetch_key(uint64_t keyid, struct openpgp_publickey **publickey,
bool intrans)
{
struct openpgp_packet_list *packets = NULL;
key.data = &keyid;
if (!intrans) {
- starttrans();
+ db4_starttrans();
}
ret = keydb(keyid)->get(keydb(keyid),
* 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 db4_fetch_key_text(const char *search,
+ struct openpgp_publickey **publickey)
{
DBC *cursor = NULL;
DBT key, data;
wordlist = makewordlist(wordlist, searchtext);
for (curword = wordlist; curword != NULL; curword = curword->next) {
- starttrans();
+ db4_starttrans();
ret = worddb->cursor(worddb,
txn,
llfree(wordlist, NULL);
wordlist = NULL;
- starttrans();
+ db4_starttrans();
for (i = 0; i < keylist.count; i++) {
numkeys += fetch_key(keylist.keys[i],
publickey,
* 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, bool intrans, bool update)
+static int db4_store_key(struct openpgp_publickey *publickey, bool intrans,
+ bool update)
{
struct openpgp_packet_list *packets = NULL;
struct openpgp_packet_list *list_end = NULL;
keyid = get_keyid(publickey);
if (!intrans) {
- starttrans();
+ db4_starttrans();
}
/*
* 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, bool intrans)
+static int db4_delete_key(uint64_t keyid, bool intrans)
{
struct openpgp_publickey *publickey = NULL;
DBT key, data;
bool deadlock = false;
if (!intrans) {
- starttrans();
+ db4_starttrans();
}
fetch_key(keyid, &publickey, true);
return deadlock ? (-1) : (ret == DB_NOTFOUND);
}
-/**
- * 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)
-{
- DBT key, data;
- DBC *cursor = NULL;
- int ret = 0;
- int fd = -1;
- int i = 0;
- char filename[1024];
-
- filename[1023] = 0;
- for (i = 0; i < numdbs; i++) {
- ret = dbconns[i]->cursor(dbconns[i],
- NULL,
- &cursor,
- 0); /* flags */
-
- snprintf(filename, 1023, "%s.%d.pgp", filenamebase, i);
- fd = open(filename, O_CREAT | O_WRONLY | O_TRUNC, 0640);
- if (fd == -1) {
- logthing(LOGTHING_ERROR,
- "Error opening keydump file (%s): %s",
- filename,
- strerror(errno));
- } else {
- memset(&key, 0, sizeof(key));
- memset(&data, 0, sizeof(data));
- ret = cursor->c_get(cursor, &key, &data, DB_NEXT);
- while (ret == 0) {
- write(fd, data.data, data.size);
- memset(&key, 0, sizeof(key));
- memset(&data, 0, sizeof(data));
- ret = cursor->c_get(cursor, &key, &data,
- DB_NEXT);
- }
- if (ret != DB_NOTFOUND) {
- logthing(LOGTHING_ERROR,
- "Problem reading key: %s",
- db_strerror(ret));
- }
- close(fd);
- }
-
- ret = cursor->c_close(cursor);
- cursor = NULL;
- }
-
- return 0;
-}
-
/**
* iterate_keys - call a function once for each key in the db.
* @iterfunc: The function to call.
*
* Returns the number of keys we iterated over.
*/
-int iterate_keys(void (*iterfunc)(void *ctx, struct openpgp_publickey *key),
- void *ctx)
+static int db4_iterate_keys(void (*iterfunc)(void *ctx,
+ struct openpgp_publickey *key), void *ctx)
{
DBT dbkey, data;
DBC *cursor = NULL;
* This function maps a 32bit key id to the full 64bit one. It returns the
* full keyid. If the key isn't found a keyid of 0 is returned.
*/
-uint64_t getfullkeyid(uint64_t keyid)
+static uint64_t db4_getfullkeyid(uint64_t keyid)
{
DBT key, data;
DBC *cursor = NULL;