X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=sbr%2Faddrsbr.c;h=201e8165be81fbf2e284318552abed1990dc5e6f;hp=09ea1311e1ea97d5877bc4602dec8c159805341c;hb=6ee8839fd9f57c6c97fa7e6e0d142d06c5ba09c3;hpb=56f27eb41e0171f34585b8ae2e232ae13fe08dc0

diff --git a/sbr/addrsbr.c b/sbr/addrsbr.c
index 09ea131..201e816 100644
--- a/sbr/addrsbr.c
+++ b/sbr/addrsbr.c
@@ -252,10 +252,10 @@ ismymbox(struct mailname *np)
 	if (am == NULL) {
 		mq.m_next = NULL;
 		mq.m_mbox = getusername();
-		if ((am = context_find("alternate-mailboxes")) == NULL)
+		mp = &mq;
+		if ((am = context_find("alternate-mailboxes")) == NULL) {
 			am = getusername();
-		else {
-			mp = &mq;
+		} else {
 			oops = 0;
 			while ((cp = getname(am))) {
 				if ((mp->m_next = getm(cp, NULL, 0, AD_NAME, NULL)) == NULL) {
@@ -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");
+			}
+
 		}
 	}