[dak/security] Sigh, I should test a bit more thoroughly occasionally

[Stephen Gran <steve@lobefin.net>]

---
 tools/debianqueued-0.9/debianqueued |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/tools/debianqueued-0.9/debianqueued b/tools/debianqueued-0.9/debianqueued
index 6d97182..0dd57a4 100755
--- a/tools/debianqueued-0.9/debianqueued
+++ b/tools/debianqueued-0.9/debianqueued
@@ -2127,12 +2127,13 @@ sub send_mail($$$) {
         my $package = keys %main::packages ? join(' ', keys %main::packages) : "";
 
         use Email::Send;
+        $Email::Send::Sendmail::SENDMAIL = '/usr/sbin/sendmail';
 
-        my $message = <<'__MESSAGE__';
-        To: $addr
-        From: dak@ftp-master.debian.org
-        Subject: $subject
-        X-Debian: DAK
+        my $message = <<__MESSAGE__;
+To: $addr
+From: dak\@ftp-master.debian.org
+Subject: $subject
+X-Debian: DAK
 __MESSAGE__
 
         if (length $package) {
@@ -2147,7 +2148,7 @@ __MESSAGE__
         }
 
         my $ret = $mail->send($message);
-        if ($ret && $ret !~ /Message sent/) {
+        if ($ret && $ret !~ /Message sent|success/) {
             return 0;
         }
 
-- 
1.5.6.5