X-Git-Url: http://the.earth.li/gitweb/?a=blobdiff_plain;f=keydb.c;h=7d3310821b4c97febed997c33db58913a6a2f9f0;hb=6b2875384c152353e94c2f40e7b58ea85d3f7503;hp=b8bd316e8e3dcf01fbb4e0f1efc02efe7eb7997e;hpb=fd58db2034c6781399583384055ce69fc300b26b;p=onak.git diff --git a/keydb.c b/keydb.c index b8bd316..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); } @@ -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;