X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/e94ac8da0e87d66927f746e6053fdafbee85cd16..567528bebc2dd1a8ccb672d11b22cbe71b292deb:/keydb_fs.c?ds=sidebyside

diff --git a/keydb_fs.c b/keydb_fs.c
index 14a954f..14220d1 100644
--- a/keydb_fs.c
+++ b/keydb_fs.c
@@ -346,10 +346,10 @@ int delete_key(uint64_t keyid, bool intrans)
 	ret = fetch_key(keyid, &pk, true);
 
 	if (ret) {
-		logthing(LOGTHING_CRITICAL, "Wordlist for key %016llX",
+		logthing(LOGTHING_DEBUG, "Wordlist for key %016llX",
 			 keyid);
 		wl = wordlist = makewordlistfromkey(wordlist, pk);
-		logthing(LOGTHING_CRITICAL,
+		logthing(LOGTHING_DEBUG,
 			 "Wordlist for key %016llX done", keyid);
 		while (wl) {
 			uint32_t hash = calchash((uint8_t *) (wl->object));
@@ -396,7 +396,7 @@ static struct ll *internal_get_key_by_word(char *word, struct ll *mct)
 
 	worddir(buffer, word, hash);
 	d = opendir(buffer);
-	logthing(LOGTHING_CRITICAL, "Scanning for word %s in dir %s", word,
+	logthing(LOGTHING_DEBUG, "Scanning for word %s in dir %s", word,
 		 buffer);
 	if (d)
 		do {
@@ -407,7 +407,7 @@ static struct ll *internal_get_key_by_word(char *word, struct ll *mct)
 					(int (*)(const void *, const void *))
 						    strcmp) !=
 					NULL)) {
-					logthing(LOGTHING_CRITICAL,
+					logthing(LOGTHING_DEBUG,
 						 "Found %s // %s", word,
 						 de->d_name);
 					keys =
@@ -434,7 +434,7 @@ int fetch_key_text(const char *search,
 	char      *searchtext = NULL;
 	int addedkeys = 0;
 
-	logthing(LOGTHING_CRITICAL, "Search was '%s'", search);
+	logthing(LOGTHING_DEBUG, "Search was '%s'", search);
 
 	searchtext = strdup(search);
 	wl = wordlist = makewordlist(wordlist, searchtext);
@@ -469,7 +469,7 @@ int fetch_key_text(const char *search,
 	/* Now add the keys... */
 	wl = keylist;
 	while (wl) {
-		logthing(LOGTHING_CRITICAL, "Adding key: %s", wl->object);
+		logthing(LOGTHING_DEBUG, "Adding key: %s", wl->object);
 		addedkeys +=
 		    fetch_key(strtoull(wl->object, NULL, 16), publickey,
 			      false);
@@ -485,15 +485,6 @@ int fetch_key_text(const char *search,
 	return addedkeys;
 }
 
-/*
- *	dumpdb - dump the key database
- *	@filenamebase: The base filename to use for the dump.
- */
-int dumpdb(char *filenamebase)
-{
-	return 0;
-}
-
 uint64_t getfullkeyid(uint64_t keyid)
 {
 	static char buffer[PATH_MAX];
@@ -532,9 +523,27 @@ uint64_t getfullkeyid(uint64_t keyid)
 	return ret;
 }
 
+/**
+ *	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.
+ */
+int iterate_keys(void (*iterfunc)(void *ctx, struct openpgp_publickey *key),
+		void *ctx)
+{
+	return 0;
+}
+
 /*
  * Include the basic keydb routines.
  */
 #define NEED_KEYID2UID 1
 #define NEED_GETKEYSIGS 1
+#define NEED_UPDATEKEYS 1
 #include "keydb.c"