X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=sbr%2Faddrsbr.c;h=96fa72f02a53ab74dbd612877300c2cfb55714c0;hb=f5df6f250dc5862488efb0198823c68f5b573ccc;hp=ea017f4da0cdd908bce55005fcb48a85ef709430;hpb=00b5842e0c5feef345a8e69cdb501f8a4c5c8c0f;p=mmh

diff --git a/sbr/addrsbr.c b/sbr/addrsbr.c
index ea017f4..96fa72f 100644
--- a/sbr/addrsbr.c
+++ b/sbr/addrsbr.c
@@ -8,6 +8,7 @@
 
 #include <sysexits.h>
 #include <h/mh.h>
+#include <h/utils.h>
 #include <h/addrsbr.h>
 #include <h/mf.h>
 
@@ -103,7 +104,7 @@ getm(char *str, char *dfhost, int dftype, int wanthost, char *eresult)
 		dftype = LOCALHOST;
 	}
 
-	mp = (struct mailname *) calloc((size_t) 1, sizeof(*mp));
+	mp = (struct mailname *) mh_xcalloc((size_t) 1, sizeof(*mp));
 	if (mp == NULL) {
 		if (eresult)
 			strcpy(eresult, "insufficient memory to represent address");
@@ -251,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) {
@@ -281,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");
+			}
+
 		}
 	}
 
@@ -379,17 +410,21 @@ local_test: ;
  * number of parsed addresses. element is set to
  * the last parsed addresse.
  */
-size_t
+ssize_t
 getmboxes(char *line, struct mailname **element)
 {
-	struct mailname *mp, *next;
+	struct mailname *mp, *next, *first;
 	char *cp;
 	size_t i = 0;
 
-	next = (*element)->m_next;
+	first = *element;
+	next = first->m_next;
 
 	while ((cp = getname(line))) {
 		mp = getm(cp, NULL, 0, AD_HOST, NULL);
+		if (mp == NULL) {
+			goto error;
+		}
 		(*element)->m_next = mp;
 		*element = mp;
 		i++;
@@ -397,4 +432,12 @@ getmboxes(char *line, struct mailname **element)
 
 	(*element)->m_next = next;
 	return i;
+error:
+	while (first->m_next != NULL && first->m_next != next) {
+		mp = first->m_next;
+		first->m_next = mp->m_next;
+		free(mp);
+	}
+	first->m_next = next;
+	return -1;
 }