From: mortenp <none@none>
Date: Wed, 14 Mar 2007 22:19:38 +0000 (+1100)
Subject: Fixed digest multipart boundary (Thanks to Ulrich Mueller)
X-Git-Tag: RELEASE_1_2_14_RC1~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9dbeadb57022920a5e66cd2288e9de3ffdd324ba;p=thirdparty%2Fmlmmj.git

Fixed digest multipart boundary (Thanks to Ulrich Mueller)
---

diff --git a/ChangeLog b/ChangeLog
index e7b0a013..6d771813 100644
--- 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 0d16e059..2cad3ba4 100644
--- 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);