From: Philipp Takacs <philipp@bureaucracy.de>
Date: Sun, 25 Oct 2015 19:57:23 +0000 (+0100)
Subject: consider Default-From as own address
X-Git-Tag: mmh-0.2~21^2
X-Git-Url: http://git.marmaro.de/?p=mmh;a=commitdiff_plain;h=fa191d6436c1fc25e645b8d88964e0fe648451d4

consider Default-From as own address
---

diff --git a/sbr/addrsbr.c b/sbr/addrsbr.c
index 09ea131..8915798 100644
--- a/sbr/addrsbr.c
+++ b/sbr/addrsbr.c
@@ -252,9 +252,9 @@ ismymbox(struct mailname *np)
 	if (am == NULL) {
 		mq.m_next = NULL;
 		mq.m_mbox = getusername();
-		if ((am = context_find("alternate-mailboxes")) == NULL)
+		if ((am = context_find("alternate-mailboxes")) == NULL) {
 			am = getusername();
-		else {
+		} else {
 			mp = &mq;
 			oops = 0;
 			while ((cp = getname(am))) {
@@ -282,15 +282,45 @@ ismymbox(struct mailname *np)
 							*cp = '\0';
 						}
 					}
-					if ((cp = getenv("MHWDEBUG")) && *cp)
+					if ((cp = getenv("MHWDEBUG")) && *cp) {
 						fprintf(stderr, "mbox=\"%s\" host=\"%s\" %s\n",
 							mp->m_mbox, mp->m_host,
 							snprintb(buffer, sizeof(buffer), (unsigned) mp->m_type, WBITS));
+					}
 				}
 			}
-			if (oops)
+			if (oops != 0) {
 				advise(NULL, "please fix the profile entry %s",
 						"alternate-mailboxes");
+			}
+		}
+
+		if ((cp = context_find("Default-From")) != NULL) {
+			int i = 0;
+			char *cp2;
+			oops = 0;
+
+			while ((cp2 = getname(cp)) != NULL) {
+				i++;
+				if ((mp->m_next = getm(cp2, NULL, 0, AD_NAME, NULL)) == NULL) {
+					admonish(NULL, "illegal address: %s", cp);
+					oops++;
+				} else {
+					mp = mp->m_next;
+					if ((cp = getenv("MHWDEBUG")) && *cp) {
+						fprintf(stderr, "mbox=\"%s\" host=\"%s\" %s\n",
+							mp->m_mbox, mp->m_host,
+							snprintb(buffer, sizeof(buffer), (unsigned) mp->m_type, WBITS));
+					}
+				}
+
+			}
+
+			if (oops != 0 || i < 1) {
+				advise(NULL, "please fix the profile entry %s",
+						"Default-From");
+			}
+
 		}
 	}
 
diff --git a/test/tests/spost/test-sender-header b/test/tests/spost/test-sender-header
index ff8399f..a0776bb 100644
--- a/test/tests/spost/test-sender-header
+++ b/test/tests/spost/test-sender-header
@@ -127,7 +127,7 @@ From: bob@example.org, charly, jack
 To: alice
 Date: Sun, 25 Oct 2015 18:59:56 +0100
 Subject: multiple from addrs (including my default addr)
-Sender: Bob <bob@example.org>
+Sender: bob@example.org
 
 foo
 ----EOM----