[dspam-dev] Patch for ^M in Quarantine / Blank Quarantines

[Jonathan A. Zdziarski]

I'm sure other people have noticed this; I've been trying to track  
down where it came from - if you use LMTP/SMTP, and a message  
quarantines with the latest version, you wind up with ^Ms in the  
mbox, which causes all messages to appear blank in the UI.

Here's the patch for that
*** dspam.c.old Sat Aug  4 22:12:57 2007
--- dspam.c     Sat Aug  4 22:15:57 2007
***************
*** 762,768 ****

    /* Reassemble message from components */

!   copyback = _ds_assemble_message (CTX->message, (USE_LMTP ||  
USE_SMTP) ? "\r\n" : "\n");
    buffer_clear (message);
    buffer_cat (message, copyback);
    free (copyback);
--- 762,773 ----

    /* Reassemble message from components */

!   if (CTX->result == DSR_ISSPAM && (!(ATX->flags &  
DAF_DELIVER_SPAM))) {
!       copyback = _ds_assemble_message (CTX->message, "\n");
!   } else {
!       copyback = _ds_assemble_message (CTX->message,
!             (USE_LMTP || USE_SMTP) ? "\r\n" : "\n");
!   }
    buffer_clear (message);
    buffer_cat (message, copyback);
    free (copyback);

Jonathan