X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/a57a146ebc3f15f1ba2dfe8ecb9b59702fb8f799..e1385087ec060568a966a5305a9d88c24a2a0a55:/keydb.c?ds=sidebyside

diff --git a/keydb.c b/keydb.c
index 1621782..7d33108 100644
--- a/keydb.c
+++ b/keydb.c
@@ -24,6 +24,7 @@
 #include "mem.h"
 #include "merge.h"
 #include "parsekey.h"
+#include "sendsync.h"
 
 #ifdef NEED_KEYID2UID
 /**
@@ -81,7 +82,7 @@ struct ll *getkeysigs(uint64_t keyid, bool *revoked)
 			sigs = keysigs(sigs, uids->sigs);
 		}
 		if (revoked != NULL) {
-			*revoked = (publickey->revocations != NULL);
+			*revoked = publickey->revoked;
 		}
 		free_publickey(publickey);
 	}
@@ -156,6 +157,7 @@ uint64_t getfullkeyid(uint64_t keyid)
 /**
  *	update_keys - Takes a list of public keys and updates them in the DB.
  *	@keys: The keys to update in the DB.
+ *	@sendsync: Should we send a sync mail to our peers.
  *
  *	Takes a list of keys and adds them to the database, merging them with
  *	the key in the database if it's already present there. The key list is
@@ -163,7 +165,7 @@ uint64_t getfullkeyid(uint64_t keyid)
  *	we had before to what we have now (ie the set of data that was added to
  *	the DB). Returns the number of entirely new keys added.
  */
-int update_keys(struct openpgp_publickey **keys)
+int update_keys(struct openpgp_publickey **keys, bool sendsync)
 {
 	struct openpgp_publickey *curkey = NULL;
 	struct openpgp_publickey *oldkey = NULL;
@@ -186,7 +188,7 @@ int update_keys(struct openpgp_publickey **keys)
 		 */
 		if (oldkey != NULL) {
 			merge_keys(oldkey, curkey);
-			if (curkey->revocations == NULL &&
+			if (curkey->sigs == NULL &&
 					curkey->uids == NULL &&
 					curkey->subkeys == NULL) {
 				if (prev == NULL) {
@@ -215,6 +217,10 @@ int update_keys(struct openpgp_publickey **keys)
 		intrans = false;
 	}
 
+	if (sendsync && keys != NULL) {
+		sendkeysync(*keys);
+	}
+
 	return newkeys;
 }
 #endif /* NEED_UPDATEKEYS */