[Logcheck-commits] Hannes von Haugwitz: src/logcheck: Use 7bit encoding for sending mail

[Hannes von Haugwitz]

Module: logcheck
Branch: master
Commit: 2e535cbb09caa10e3f86b913ac8fe63a35491a66
URL:    http://git.debian.org/?p=logcheck/logcheck.git;a=commit;h=2e535cbb09caa10e3f86b913ac8fe63a35491a66

Author: Hannes von Haugwitz <hannes at vonhaugwitz.com>
Date:   Fri Feb 12 09:51:28 2010 +0100

src/logcheck: Use 7bit encoding for sending mail

---

 debian/changelog |    2 ++
 src/logcheck     |    8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b341766..c222207 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 logcheck (1.3.7) UNRELEASED; urgency=low
 
   [ Hannes von Haugwitz ]
+  * src/logcheck:
+    - use 7bit encoding for sending mail
   * ignore.d.workstation/kernel:
     - added rules for inserted and removed SD cards
   * ignore.d.server/mountd: new
diff --git a/src/logcheck b/src/logcheck
index 436bee9..21200cd 100755
--- a/src/logcheck
+++ b/src/logcheck
@@ -175,8 +175,8 @@ Also verify that the logcheck user can read all files referenced in
 $(export)
 EOF
 	} | eval mime-construct $MIMECONSTRUCTARGS \
-	    --subject "'Logcheck: $HOSTNAME $DATE exiting due to errors'" --file - \
-	    --to "$SENDMAILTO"
+	    --subject "'Logcheck: $HOSTNAME $DATE exiting due to errors'" --encoding "7bit" \
+        --file - --to "$SENDMAILTO"
 
     elif [ "$MAILOUT" -eq 1 ]; then
           {
@@ -302,10 +302,10 @@ sendreport() {
 	debug "Sending report: '$subject' to $SENDMAILTO"
         if [ "$MAILASATTACH" -eq 1 ]; then
           debug "Sending report as attachment"
-          eval mime-construct $MIMECONSTRUCTARGS --subject "'$subject'" --string "'Report attached'" --to "$SENDMAILTO" --attachment "logcheck_report" --encoding "base64" --file "$TMPDIR/report"
+          eval mime-construct $MIMECONSTRUCTARGS --subject "'$subject'" --encoding "7bit" --string "'Report attached'" --to "$SENDMAILTO" --attachment "logcheck_report" --encoding "7bit" --file "$TMPDIR/report"
           return $?
         fi
-        eval mime-construct $MIMECONSTRUCTARGS --subject "'$subject'" --to "$SENDMAILTO" --file "$TMPDIR/report"
+        eval mime-construct $MIMECONSTRUCTARGS --subject "'$subject'" --to "$SENDMAILTO" --encoding "7bit" --file "$TMPDIR/report"
     fi
 }