** 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
*/
static char err[BUFSIZ];
static char adr[BUFSIZ];
-/* static prototype */
-char *OfficialName(char *);
-
char *
getname(char *addrs)
struct mailname *
getm(char *str, char *dfhost, int dftype, int wanthost, char *eresult)
{
- char *pp;
struct mailname *mp;
if (err[0]) {
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;
}
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)
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
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))
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)
-{
- unsigned char *p;
- char *q, site[BUFSIZ];
- struct addrinfo hints, *res;
-
- 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();
-
- 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;
- }
-
- strncpy(buffer, site, sizeof(buffer));
- return buffer;
-}