X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=sbr%2Faddrsbr.c;h=8915798270a0303cdd315a3d61364a9711a14e46;hp=2327e47ad064a6034fa45eb330f9992587abedf5;hb=fa191d6436c1fc25e645b8d88964e0fe648451d4;hpb=83e04675b53374a1436029a367283d6d4ee05a07

diff --git a/sbr/addrsbr.c b/sbr/addrsbr.c
index 2327e47..8915798 100644
--- a/sbr/addrsbr.c
+++ b/sbr/addrsbr.c
@@ -6,7 +6,9 @@
 ** complete copyright information.
 */
 
+#include <sysexits.h>
 #include <h/mh.h>
+#include <h/utils.h>
 #include <h/addrsbr.h>
 #include <h/mf.h>
 
@@ -40,9 +42,6 @@ static char *note = NULL;
 static char err[BUFSIZ];
 static char adr[BUFSIZ];
 
-/* static prototype */
-char *OfficialName(char *);
-
 
 char *
 getname(char *addrs)
@@ -105,12 +104,12 @@ 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");
 		else if (wanthost == AD_HOST)
-			adios(NULL, "insufficient memory to represent address");
+			adios(EX_OSERR, NULL, "insufficient memory to represent address");
 		return NULL;
 	}
 
@@ -238,13 +237,13 @@ int
 ismymbox(struct mailname *np)
 {
 	int oops;
-	register int len, i;
-	register char *cp;
-	register char *pp;
+	int len, i;
+	char *cp;
+	char *pp;
 	char buffer[BUFSIZ];
 	struct mailname *mp;
 	static char *am = NULL;
-	static struct mailname mq={NULL};
+	static struct mailname mq;
 
 	/*
 	** If this is the first call, initialize
@@ -253,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))) {
@@ -283,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");
+			}
+
 		}
 	}
 
@@ -376,49 +405,27 @@ local_test: ;
 	return 0;
 }
 
-
 /*
-** Moved from hosts.c -- find out the official name of a host
-*/
-
-/*
-** In the SendMail world, we really don't know what the valid
-** hosts are.  We could poke around in the sendmail.cf file, but
-** that still isn't a guarantee.  As a result, we'll say that
-** everything is a valid host, and let SendMail worry about it.
-*/
-
-#include <netdb.h>
-
-
-char *
-OfficialName(char *name)
+ * Insert mailname after element and returns the
+ * number of parsed addresses. element is set to
+ * the last parsed addresse.
+ */
+size_t
+getmboxes(char *line, struct mailname **element)
 {
-	unsigned char *p;
-	char *q, site[BUFSIZ];
-	struct addrinfo hints, *res;
+	struct mailname *mp, *next;
+	char *cp;
+	size_t i = 0;
 
-	static char buffer[BUFSIZ];
+	next = (*element)->m_next;
 
-	for (p = name, q = site; *p && (q - site < sizeof(site) - 1); p++, q++)
-		*q = isupper(*p) ? tolower(*p) : *p;
-	*q = '\0';
-	q = site;
-
-	if (!mh_strcasecmp(LocalName(), site))
-		return LocalName();
-
-	memset(&hints, 0, sizeof(hints));
-	hints.ai_flags = AI_CANONNAME;
-	hints.ai_family = PF_UNSPEC;
-
-	if (getaddrinfo(q, NULL, &hints, &res) == 0) {
-		strncpy(buffer, res->ai_canonname, sizeof(buffer));
-		buffer[sizeof(buffer) - 1] = '\0';
-		freeaddrinfo(res);
-		return buffer;
+	while ((cp = getname(line))) {
+		mp = getm(cp, NULL, 0, AD_HOST, NULL);
+		(*element)->m_next = mp;
+		*element = mp;
+		i++;
 	}
 
-	strncpy(buffer, site, sizeof(buffer));
-	return buffer;
+	(*element)->m_next = next;
+	return i;
 }