summaryrefslogtreecommitdiffstats
path: root/g10/export.c
diff options
context:
space:
mode:
authorJustus Winter <justus@g10code.com>2017-03-08 11:01:22 +0100
committerJustus Winter <justus@g10code.com>2017-03-08 13:31:10 +0100
commit2649fdfff5d9e227025956e015b67502fd4962c4 (patch)
treebb438851a7a66668a8a38ddba389c3f584da594b /g10/export.c
parentdirmngr: Do not put a keyserver into a new dirmngr.conf (diff)
downloadgnupg2-2649fdfff5d9e227025956e015b67502fd4962c4.tar.xz
gnupg2-2649fdfff5d9e227025956e015b67502fd4962c4.zip
g10: Move more flags into the flag bitfield.
* g10/packet.h (PKT_user_id): Move 'is_primary', 'is_revoked', and 'is_expired' into the flags bitfield, and drop the prefix. * g10/call-dirmngr.c: Adapt accordingly. * g10/export.c: Likewise. * g10/getkey.c: Likewise. * g10/import.c: Likewise. * g10/kbnode.c: Likewise. * g10/keyedit.c: Likewise. * g10/keylist.c: Likewise. * g10/keyserver.c: Likewise. * g10/mainproc.c: Likewise. * g10/pkclist.c: Likewise. * g10/pubkey-enc.c: Likewise. * g10/tofu.c: Likewise. * g10/trust.c: Likewise. * g10/trustdb.c: Likewise. -- This patch has been created by applying the following semantic patch: @@ expression E; @@ -E->is_expired +E->flags.expired @@ expression E; @@ -E->is_primary +E->flags.primary @@ expression E; @@ -E->is_revoked +E->flags.revoked Signed-off-by: Justus Winter <justus@g10code.com>
Diffstat (limited to 'g10/export.c')
-rw-r--r--g10/export.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/g10/export.c b/g10/export.c
index 2da5309bd..a7aecd65a 100644
--- a/g10/export.c
+++ b/g10/export.c
@@ -1434,7 +1434,7 @@ print_pka_or_dane_records (iobuf_t out, kbnode_t keyblock, PKT_public_key *pk,
continue;
uid = node->pkt->pkt.user_id;
- if (uid->is_expired || uid->is_revoked)
+ if (uid->flags.expired || uid->flags.revoked)
continue;
xfree (mbox);