summaryrefslogtreecommitdiff
path: root/mail/dspam-devel/files/patch-dspam.c
diff options
context:
space:
mode:
Diffstat (limited to 'mail/dspam-devel/files/patch-dspam.c')
-rw-r--r--mail/dspam-devel/files/patch-dspam.c45
1 files changed, 1 insertions, 44 deletions
diff --git a/mail/dspam-devel/files/patch-dspam.c b/mail/dspam-devel/files/patch-dspam.c
index c4b60d7626ad..678305f2d9d0 100644
--- a/mail/dspam-devel/files/patch-dspam.c
+++ b/mail/dspam-devel/files/patch-dspam.c
@@ -20,47 +20,4 @@
+// } // end of FreeBSD patch
if (!strcmp(_ds_pref_val(PTX, "showFactors"), "on")) {
-
-@@ -2594,7 +2595,7 @@
- int embed_signature(DSPAM_CTX *CTX, AGENT_CTX *ATX, agent_pref_t PTX) {
- struct nt_node *node_nt;
- struct nt_c c_nt;
--/* char toplevel_boundary[128] = { 0 }; */
-+ char toplevel_boundary[128] = { 0 };
- struct _ds_message_block *block;
- int i = 0;
-
-@@ -2613,13 +2614,13 @@
- if (block->media_subtype == MST_SIGNED)
- return embed_signed(CTX, ATX, PTX);
-
--/*
-+
- if (block->media_type == MT_MULTIPART && block->terminating_boundary != NULL)
- {
- strlcpy(toplevel_boundary, block->terminating_boundary,
- sizeof(toplevel_boundary));
- }
--*/
-+
-
- while (node_nt != NULL)
- {
-@@ -2635,16 +2636,7 @@
- && (block->media_type == MT_TEXT
- || (block->boundary == NULL && i == 0
- && block->media_type != MT_MULTIPART))
--
-- /* The part is one of the top-level parts */
-- && (
--/*toplevel_boundary[0] == 0 || */
-- (block->terminating_boundary
--/* &&
-- !strncmp(block->terminating_boundary, toplevel_boundary,
-- strlen(toplevel_boundary))
--*/
-- )))
-+ && (toplevel_boundary[0] == 0 || block->terminating_boundary))
- {
- int is_attachment = 0;
- struct _ds_header_field *field;
+