From: markus schnalke <meillo@marmaro.de>
Date: Tue, 27 Mar 2012 13:18:49 +0000 (+0200)
Subject: Make sure we don't send Envelope-From if we're using spost.
X-Git-Tag: mmh-thesis-end~129
X-Git-Url: http://git.marmaro.de/?a=commitdiff_plain;h=9baa20b6178dec82264945744200af013c05b3bd;p=mmh

Make sure we don't send Envelope-From if we're using spost.

Pulled in from nmh. Thanks to Ken Hornstein.
---

diff --git a/uip/spost.c b/uip/spost.c
index 69d4708..93283cc 100644
--- a/uip/spost.c
+++ b/uip/spost.c
@@ -87,6 +87,7 @@ static struct headers NHeaders[] = {
 	{ "Bcc", HADR|HTRY|HBCC, MINV },
 	{ "Message-Id", HBAD, 0 },
 	{ "Fcc", HFCC, 0 },
+	{ "Envelope-From", HIGN, 0 },
 	{ NULL, 0, 0 }
 };
 
@@ -103,6 +104,7 @@ static struct headers RHeaders[] = {
 	{ "Resent-Fcc", HFCC, 0 },
 	{ "Reply-To", HADR, 0 },
 	{ "Fcc", HIGN, 0 },
+	{ "Envelope-From", HIGN, 0 },
 	{ NULL, 0, 0 }
 };