Allow checking for signature times and use in merging

[onak.git] / keydb.c

diff --git a/keydb.c b/keydb.c
index b8bd316e8e3dcf01fbb4e0f1efc02efe7eb7997e..7d3310821b4c97febed997c33db58913a6a2f9f0 100644 (file)
--- 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);
        }
@@ -187,7 +188,7 @@ int update_keys(struct openpgp_publickey **keys, bool sendsync)
                 */
                if (oldkey != NULL) {
                        merge_keys(oldkey, curkey);
-                       if (curkey->revocations == NULL &&
+                       if (curkey->sigs == NULL &&
                                        curkey->uids == NULL &&
                                        curkey->subkeys == NULL) {
                                if (prev == NULL) {
@@ -217,7 +218,7 @@ int update_keys(struct openpgp_publickey **keys, bool sendsync)
        }
 
        if (sendsync && keys != NULL) {
-               sendkeysync(keys);
+               sendkeysync(*keys);
        }
 
        return newkeys;