Fixed digest multipart boundary (Thanks to Ulrich Mueller)

diff --git a/ChangeLog b/ChangeLog
index e7b0a013574b6bc7935ab4a51beeb644ea9ec6aa..6d77181399b2e8e9f548838f06a4cac6ae9cd40a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+ o Fixed digest multipart boundary (Thanks to Ulrich Mueller)
  o Added support for mail size limit (Christoph Wilke)
  o Log the result of access rules in the operation log (Henne Vogelsang)
  o Ignore empty lines in control files

diff --git a/src/send_digest.c b/src/send_digest.c
index 0d16e0590ad76f0ac902bc8e37352fd8bc6e8cfc..2cad3ba4103e22b042acae75858d7085a8f5c09b 100644 (file)
--- a/src/send_digest.c
+++ b/src/send_digest.c
@@ -313,7 +313,7 @@ errdighdrs:
 
        if ((txtfd > 0) && !statctrl(listdir, "nodigesttext")) {
 
-               tmp = concatstr(3, "--", boundary,
+               tmp = concatstr(3, "\n--", boundary,
                                "\nContent-Type: text/plain; charset=UTF-8"
                                "\n\n");
                if (writen(fd, tmp, strlen(tmp)) == -1) {
@@ -386,7 +386,7 @@ errdighdrs:
                if (archivefd < 0)
                        continue;
                
-               tmp = concatstr(7, "--", boundary,
+               tmp = concatstr(7, "\n--", boundary,
                                "\nContent-Type: message/rfc822"
                                "\nContent-Disposition: inline; filename=\"",
                                        listname, "_", buf, ".eml\""
@@ -422,7 +422,7 @@ errdighdrs:
                close(archivefd);
        }
 
-       tmp = concatstr(3, "--", boundary, "--\n");
+       tmp = concatstr(3, "\n--", boundary, "--\n");
        if (writen(fd, tmp, strlen(tmp)) == -1) {
                log_error(LOG_ARGS, "Could not write digest end to '%s'",
                                queuename);