diff options
| author | Eduardo Chappa <chappa@washington.edu> | 2018-06-27 11:54:12 -0600 |
|---|---|---|
| committer | Eduardo Chappa <chappa@washington.edu> | 2018-06-27 11:54:12 -0600 |
| commit | 5d1f76edbfa357181f1a8662aa990c8b3e89f775 (patch) | |
| tree | 9aa23e4c2379dff55ac63d549714b5489764c537 | |
| parent | b26daed8090cd71b90c390254d5ec4d790ab6fbf (diff) | |
| download | alpine-5d1f76edbfa357181f1a8662aa990c8b3e89f775.tar.xz | |
* Add a similar modification to include the message from a
multipart/mixed message that contain a signed part.
| -rw-r--r-- | pith/pine.hlp | 2 | ||||
| -rw-r--r-- | pith/reply.c | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/pith/pine.hlp b/pith/pine.hlp index 2eacb0e9..9b461884 100644 --- a/pith/pine.hlp +++ b/pith/pine.hlp @@ -140,7 +140,7 @@ with help text for the config screen and the composer that didn't have any reasonable place to be called from. Dummy change to get revision in pine.hlp ============= h_revision ================= -Alpine Commit 290 2018-06-26 15:47:31 +Alpine Commit 292 2018-06-27 11:54:08 ============= h_news ================= <HTML> <HEAD> diff --git a/pith/reply.c b/pith/reply.c index 0fb8199e..4963a5d3 100644 --- a/pith/reply.c +++ b/pith/reply.c @@ -1089,7 +1089,11 @@ reply_body(MAILSTREAM *stream, ENVELOPE *env, struct mail_bodystruct *orig_body, && orig_body->nested.part && orig_body->nested.part->body.type == TYPEMULTIPART && orig_body->nested.part->body.subtype - && !strucmp(orig_body->nested.part->body.subtype, "signed")){ + && (!strucmp(orig_body->nested.part->body.subtype, "signed") +#ifdef SMIME + || !strucmp(orig_body->nested.part->body.subtype, OUR_PKCS7_ENCLOSURE_SUBTYPE) +#endif /* SMIME */ + )){ /* we can call reply_body as in the call above with section * equal to "1", but that adds the multipart text to the * list of attachments. We do not want that, so we redo this |