chiark
/
gitweb
/
~ian
/
gnupg2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gpg: Avoid spurious warnings about trust packets.
[gnupg2.git]
/
g10
/
keydb.c
diff --git
a/g10/keydb.c
b/g10/keydb.c
index aab90e380d93969ada190f9dcb45be961f1c3336..81dd32ec9e56de0784a7c011d31c3477b5567055 100644
(file)
--- a/
g10/keydb.c
+++ b/
g10/keydb.c
@@
-1205,8
+1205,9
@@
parse_keyblock_image (iobuf_t iobuf, int pk_no, int uid_no,
default:
/* Note that can't allow ring trust packets here and some of
the other GPG specific packets don't make sense either. */
default:
/* Note that can't allow ring trust packets here and some of
the other GPG specific packets don't make sense either. */
- log_error ("skipped packet of type %d in keybox\n",
- (int)pkt->pkttype);
+ if (pkt->pkttype != PKT_RING_TRUST)
+ log_error ("skipped packet of type %d in keybox\n",
+ (int)pkt->pkttype);
free_packet(pkt);
init_packet(pkt);
continue;
free_packet(pkt);
init_packet(pkt);
continue;