find recipients for sendmail

[mmh] / sbr / addrsbr.c

diff --git a/sbr/addrsbr.c b/sbr/addrsbr.c
index a829c1d..ea017f4 100644 (file)
--- a/sbr/addrsbr.c
+++ b/sbr/addrsbr.c
@@ -6,6 +6,7 @@
 ** complete copyright information.
 */
 
+#include <sysexits.h>
 #include <h/mh.h>
 #include <h/addrsbr.h>
 #include <h/mf.h>
@@ -24,7 +25,7 @@
 ** to their "official" represenations.
 **
 ** To summarize, when we're all done, here's what MH knows about the address:
-**       type: local, uucp, or network
+**       type: local or network
 **       host:  not locally defaulted, not explicitly expanded
 **       everything else
 */
@@ -40,9 +41,6 @@ static char *note = NULL;
 static char err[BUFSIZ];
 static char adr[BUFSIZ];
 
-/* static prototype */
-char *OfficialName(char *);
-
 
 char *
 getname(char *addrs)
@@ -73,7 +71,6 @@ getname(char *addrs)
 struct mailname *
 getm(char *str, char *dfhost, int dftype, int wanthost, char *eresult)
 {
-       char *pp;
        struct mailname *mp;
 
        if (err[0]) {
@@ -111,7 +108,7 @@ getm(char *str, char *dfhost, int dftype, int wanthost, char *eresult)
                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;
        }
 
@@ -134,21 +131,14 @@ getm(char *str, char *dfhost, int dftype, int wanthost, char *eresult)
                mp->m_mbox = getcpy(mbox);
                mp->m_host = getcpy(host);
        } else {
-               if ((pp = strchr(mbox, '!'))) {
-                       *pp++ = '\0';
-                       mp->m_mbox = getcpy(pp);
-                       mp->m_host = getcpy(mbox);
-                       mp->m_type = UUCPHOST;
+               mp->m_nohost = 1;
+               mp->m_mbox = getcpy(mbox);
+               if (route == NULL && dftype == LOCALHOST) {
+                       mp->m_host = NULL;
+                       mp->m_type = dftype;
                } else {
-                       mp->m_nohost = 1;
-                       mp->m_mbox = getcpy(mbox);
-                       if (route == NULL && dftype == LOCALHOST) {
-                               mp->m_host = NULL;
-                               mp->m_type = dftype;
-                       } else {
-                               mp->m_host = route ? NULL : getcpy(dfhost);
-                               mp->m_type = route ? NETHOST : dftype;
-                       }
+                       mp->m_host = route ? NULL : getcpy(dfhost);
+                       mp->m_type = route ? NETHOST : dftype;
                }
                goto got_host;
        }
@@ -207,11 +197,9 @@ adrformat(struct mailname *mp)
 
        if (mp->m_nohost)
                strncpy(addr, mp->m_mbox ? mp->m_mbox : "", sizeof(addr));
-       else if (mp->m_type != UUCPHOST)
+       else
                snprintf(addr, sizeof(addr), mp->m_host ? "%s%s@%s" : "%s%s",
                        empty(mp->m_path), empty(mp->m_mbox), mp->m_host);
-       else
-               snprintf(addr, sizeof(addr), "%s!%s", mp->m_host, mp->m_mbox);
 
        if (mp->m_pers || mp->m_path) {
                if (mp->m_note)
@@ -248,13 +236,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
@@ -315,9 +303,6 @@ ismymbox(struct mailname *np)
                        break;
                goto local_test;
 
-       case UUCPHOST:
-               if (mh_strcasecmp(np->m_host, SystemName()))
-                       break;  /* fall */
        case LOCALHOST:
 local_test: ;
                if (!mh_strcasecmp(np->m_mbox, mq.m_mbox))
@@ -389,49 +374,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];
-
-       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();
+       next = (*element)->m_next;
 
-       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;
 }