From 5d2dc02ed479ad06dcc003da9b869213350f31a0 Mon Sep 17 00:00:00 2001
From: Matthias Andree <matthias.andree@gmx.de>
Date: Sat, 23 Jul 2005 16:14:58 +0000
Subject: Add From: header to warning emails. Debian Bug#244828.

svn path=/trunk/; revision=4169
---
 NEWS   | 1 +
 sink.c | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/NEWS b/NEWS
index a65fbdd8..a2eae25f 100644
--- a/NEWS
+++ b/NEWS
@@ -136,6 +136,7 @@ OTHER CHANGES:
   Fixes Debian bug #230615. Matthias Andree.
 * Make ODMR really silent, suppress "fetchmail: receiving message
   data". Fixes Debian Bug#296163. Matthias Andree.
+* Add From: header to warning emails. Debian Bug#244828. Matthias Andree.
 
 fetchmail-6.2.5 (Wed Oct 15 18:39:22 EDT 2003), 23079 lines:
 
diff --git a/sink.c b/sink.c
index cf141872..e18e594e 100644
--- a/sink.c
+++ b/sink.c
@@ -1502,6 +1502,8 @@ int open_warning_by_mail(struct query *ctl, struct msgblk *msg)
     else				/* send to postmaster  */
 	status = open_sink(ctl, &reply, &good, &bad);
     if (status == 0) {
+	stuff_warning(NULL, ctl, "From: FETCHMAIL-DAEMON@%s",
+		ctl->smtpaddress ? ctl->smtpaddress : fetchmailhost);
 	stuff_warning(NULL, ctl, "Date: %s", rfc822timestamp());
 	stuff_warning(NULL, ctl, "MIME-Version: 1.0");
 	stuff_warning(NULL, ctl, "Content-Transfer-Encoding: 8bit");
-- 
cgit v1.2.3