Fix Content-Transfer-Encoding: header for digests,

and always close digest listtext

diff --git a/ChangeLog b/ChangeLog
index 299ce69d0dac3cd0bcb3aa864bed4de9bd28e2ba..ce826714fe70d292450fd203bf5d6a8cc7230ebd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+ o Ensure digest listtext is always closed
+ o Fix Content-Transfer-Encoding: header for digests
  o Fixed a bug that could cause a crash if $posteraddr$ appeared in the
    maxmaiilsize listtext
  o Documented listtexts

diff --git a/src/send_digest.c b/src/send_digest.c
index 46c77b27bc9e3759add45d0cd4e846adab7da984..127b15f773ede741da1a8fd3f33e205fbfa0ad11 100644 (file)
--- a/src/send_digest.c
+++ b/src/send_digest.c
@@ -321,7 +321,7 @@ errdighdrs:
 
                tmp = concatstr(3, "\n--", boundary,
                                "\nContent-Type: text/plain; charset=UTF-8"
-                               "\nContent-Encoding: 8bit"
+                               "\nContent-Transfer-Encoding: 8bit"
                                "\n\n");
                if (writen(fd, tmp, strlen(tmp)) == -1) {
                        log_error(LOG_ARGS, "Could not write digest text/plain"
@@ -375,6 +375,8 @@ errdighdrs:
                        } while ((line = mygetline(txtfd)));
                }
 
+               close(txtfd);
+       } else if (txtfd > 0) {
                close(txtfd);
        }