diff options
| author | David Shaw <[email protected]> | 2005-05-14 02:38:31 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2005-05-14 02:38:31 +0000 |
| commit | c5fa20dba312d0c6596ecf83414a8e83d7dab584 (patch) | |
| tree | 993f3f4506052ff66547da2caa5d765c106a9e8b /g10/export.c | |
| parent | * keygen.c (write_selfsigs): Rename from write_selfsig. Write the same (diff) | |
| download | gnupg-c5fa20dba312d0c6596ecf83414a8e83d7dab584.tar.gz gnupg-c5fa20dba312d0c6596ecf83414a8e83d7dab584.zip | |
* build-packet.c (do_comment): Removed. (build_packet): Ignore
comment packets.
* export.c (do_export_stream): Don't export comment packets any
longer.
* options.h, g10.c (main): Remove --sk-comments and --no-sk-comments
options, and replace with no-op.
Diffstat (limited to '')
| -rw-r--r-- | g10/export.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/g10/export.c b/g10/export.c index 73aa750e9..b91c0442e 100644 --- a/g10/export.c +++ b/g10/export.c @@ -240,10 +240,11 @@ do_export_stream( IOBUF out, STRLIST users, int secret, continue; } - /* don't export any comment packets but those in the - * secret keyring */ - if( !secret && node->pkt->pkttype == PKT_COMMENT ) - continue; + /* We used to use comment packets, but not any longer. In + case we still have comments on a key, strip them here + before we call build_packet(). */ + if( node->pkt->pkttype == PKT_COMMENT ) + continue; /* make sure that ring_trust packets never get exported */ if (node->pkt->pkttype == PKT_RING_TRUST) @@ -335,7 +336,8 @@ do_export_stream( IOBUF out, STRLIST users, int secret, || node->pkt->pkt.signature->keyid[1]!=keyid[1])) continue; - /* do not export packets which are marked as not exportable */ + /* do not export packets which are marked as not + exportable */ if(!(options&EXPORT_LOCAL_SIGS) && !node->pkt->pkt.signature->flags.exportable) continue; /* not exportable */ |