From a07ed2ca77a6d667b84ac7e36c48c02bcb3f4a83 Mon Sep 17 00:00:00 2001
From: Devin Carraway <qpsmtpd@devin.com>
Date: Tue, 28 Feb 2006 07:04:52 +0000
Subject: [PATCH] Oops.  Don't emit a newline between header and body when
 queueing over bsmtp, because the body itself already contains one.

git-svn-id: https://svn.perl.org/qpsmtpd/branches/0.3x@623 958fd67b-6ff1-0310-b445-bb7760255be9
---
 Changes                  | 3 +++
 plugins/queue/exim-bsmtp | 3 +--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Changes b/Changes
index 99bab6b..74b9deb 100644
--- a/Changes
+++ b/Changes
@@ -1,5 +1,8 @@
 0.33
 
+   Fix a spurious newline at the start of messages queued via exim (Devin
+   Carraway)
+
    Make the clamdscan plugin temporarily deny mail if if can't talk to clamd
    (Filippo Carletti)
 
diff --git a/plugins/queue/exim-bsmtp b/plugins/queue/exim-bsmtp
index 1258c40..8d02eff 100644
--- a/plugins/queue/exim-bsmtp
+++ b/plugins/queue/exim-bsmtp
@@ -90,8 +90,7 @@ sub hook_queue {
                "MAIL FROM:<", ($txn->sender->address || ''), ">\n";
     print $tmp "RCPT TO:<", ($_->address || ''), ">\n"
       for $txn->recipients;
-    print $tmp "DATA\n",
-               $txn->header->as_string, "\n";
+    print $tmp "DATA\n", $txn->header->as_string;
     $txn->body_resetpos;
     while (my $line = $txn->body_getline) {
       $line =~ s/^\./../;