diff options
| author | Werner Koch <wk@gnupg.org> | 2016-09-29 10:20:38 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2016-09-29 17:56:37 +0200 |
| commit | 95d60c6ce9e8a7a7741553af957978c1f91547c5 (patch) | |
| tree | bdcdfe5d0d41081bf53ec022f6a455b407a4c9ce /tools/gpg-wks-server.c | |
| parent | tools: Give mime parser callbacks access to the rfc822 parser. (diff) | |
| download | gnupg2-95d60c6ce9e8a7a7741553af957978c1f91547c5.tar.xz gnupg2-95d60c6ce9e8a7a7741553af957978c1f91547c5.zip | |
tools: Simplify the mime-maker container creation.
* tools/mime-maker.c (struct part_s): Remove field MEDIATYPE.
(release_parts): Ditto.
(dump_parts): Print a body line only if tehre is a body.
(mime_maker_add_header): Check for body or container.
(mime_maker_add_container): Remove arg MEDIATYPE. Change all callers.
(mime_maker_end_container): New.
Signed-off-by: Werner Koch <wk@gnupg.org>
Diffstat (limited to 'tools/gpg-wks-server.c')
| -rw-r--r-- | tools/gpg-wks-server.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/gpg-wks-server.c b/tools/gpg-wks-server.c index 678000c80..96e5e05a5 100644 --- a/tools/gpg-wks-server.c +++ b/tools/gpg-wks-server.c @@ -1007,7 +1007,7 @@ send_confirmation_request (server_ctx_t ctx, "protocol=\"application/pgp-encrypted\""); if (err) goto leave; - err = mime_maker_add_container (mime, "multipart/encrypted"); + err = mime_maker_add_container (mime); if (err) goto leave; @@ -1214,7 +1214,7 @@ send_congratulation_message (const char *mbox, const char *keyfile) "protocol=\"application/pgp-encrypted\""); if (err) goto leave; - err = mime_maker_add_container (mime, "multipart/encrypted"); + err = mime_maker_add_container (mime); if (err) goto leave; |