X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=sbr%2Faddrsbr.c;h=929b4914b5d7718b6cab207c0e4c90457b4c2e4e;hb=356f49083391bd018b6c5dfed21e59247b4cc74a;hp=a99d9aab42a08c352dc3822bf74ca36d06894804;hpb=2ce001e1b0b7cc5366ea2804f66726e57910282b;p=mmh diff --git a/sbr/addrsbr.c b/sbr/addrsbr.c index a99d9aa..929b491 100644 --- a/sbr/addrsbr.c +++ b/sbr/addrsbr.c @@ -10,6 +10,7 @@ #include #include #include +#include /* High level parsing of addresses: @@ -76,15 +77,6 @@ static char err[BUFSIZ]; static char adr[BUFSIZ]; -extern boolean username_extension_masquerading; /* defined in mts.c */ - - -/* - * external prototypes - */ -char *getusername (void); - - char * getname (char *addrs) { @@ -145,7 +137,7 @@ getm (char *str, char *dfhost, int dftype, int wanthost, char *eresult) } if (dfhost == NULL) { - dfhost = LocalName (); + dfhost = LocalName (0); dftype = LOCALHOST; } @@ -177,37 +169,30 @@ getm (char *str, char *dfhost, int dftype, int wanthost, char *eresult) if (host) { mp->m_mbox = getcpy (mbox); mp->m_host = getcpy (host); - } - else { + mp->m_type = + mh_strcasecmp (LocalName(0), mp->m_host) ? NETHOST : LOCALHOST; + } else { if ((pp = strchr(mbox, '!'))) { *pp++ = '\0'; mp->m_mbox = getcpy (pp); mp->m_host = getcpy (mbox); mp->m_type = UUCPHOST; - } - else { + } else { mp->m_nohost = 1; mp->m_mbox = getcpy (mbox); if (route == NULL && dftype == LOCALHOST) { mp->m_host = NULL; mp->m_type = dftype; - } - else - { + } else { mp->m_host = route ? NULL : getcpy (dfhost); mp->m_type = route ? NETHOST : dftype; } } - goto got_host; } - if (wanthost == AD_NHST) - mp->m_type = !mh_strcasecmp (LocalName (), mp->m_host) - ? LOCALHOST : NETHOST; - else - mp->m_type = mh_strcasecmp (LocalName(), mp->m_host) ? NETHOST : LOCALHOST; + /* For alternate mailboxes, m_type gets overwritten in ismymbox () + to support wild-card matching. */ -got_host: ; if (route) mp->m_path = getcpy (route); mp->m_ingrp = ingrp; @@ -287,54 +272,20 @@ auxformat (struct mailname *mp, int extras) /* - * address specific "sprintf" + * This used to be adrsprintf() (where it would format an address for you + * given a username and a domain). But somewhere we got to the point where + * the only caller was post, and it only called it with both arguments NULL. + * So the function was renamed with a more sensible name. */ char * -adrsprintf (char *username, char *domain) +getlocaladdr(void) { - int snprintf_return; - static char addr[BUFSIZ]; - - if (username == NULL) - username = getusername(); - - if (username_extension_masquerading) { - /* mts.conf contains "masquerade:[...]username_extension[...]", so tack - on the value of the $USERNAME_EXTENSION environment variable, if set, - to username. */ - char* extension = getenv("USERNAME_EXTENSION"); - static char username_with_extension[BUFSIZ]; - - if (extension != NULL && *extension != '\0') { - snprintf_return = snprintf(username_with_extension, - sizeof(username_with_extension), - "%s%s", username, extension); - - if (snprintf_return < 0 || - snprintf_return >= sizeof(username_with_extension)) - adios(NULL, "snprintf() error writing username (%d chars) and" - " $USERNAME_EXTENSION (%d chars) to array of BUFSIZ (%d)" - " chars", - strlen(username), strlen(extension), BUFSIZ); - - username = username_with_extension; - } - } - - return username; + char *username; - if (domain == NULL) - domain = LocalName(); + username = getusername(); - snprintf_return = snprintf (addr, sizeof(addr), "%s@%s", username, domain); - - if (snprintf_return < 0 || snprintf_return >= sizeof(addr)) - adios(NULL, "snprintf() error writing username (%d chars), domain (%d" - " chars), and 1 separator char to array of BUFSIZ (%d) chars", - strlen(username), strlen(domain), BUFSIZ); - - return addr; + return username; } @@ -362,6 +313,7 @@ ismymbox (struct mailname *np) struct mailname *mp; static char *am = NULL; static struct mailname mq; + static int localmailbox = 0; /* * If this is the first call, initialize @@ -370,10 +322,34 @@ ismymbox (struct mailname *np) if (am == NULL) { mq.m_next = NULL; mq.m_mbox = getusername (); + + if ((am = context_find ("local-mailbox"))) { + + localmailbox++; + + if ((cp = getname(am)) == NULL) { + admonish (NULL, "Unable to find address in local-mailbox"); + return 0; + } + + if ((mq.m_next = getm (cp, NULL, 0, AD_NAME, NULL)) == NULL) { + admonish (NULL, "invalid entry in local-mailbox: %s", cp); + return 0; + } + + /* + * Sigh, it turns out that the address parser gets messed up + * if you don't call getname() until it returns NULL. + */ + + while ((cp = getname(am)) != NULL) + ; + } + if ((am = context_find ("alternate-mailboxes")) == NULL) am = getusername(); else { - mp = &mq; + mp = mq.m_next ? mq.m_next : &mq; oops = 0; while ((cp = getname (am))) { if ((mp->m_next = getm (cp, NULL, 0, AD_NAME, NULL)) == NULL) { @@ -400,40 +376,52 @@ ismymbox (struct mailname *np) *cp = '\0'; } } - 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) advise (NULL, "please fix the %s: entry in your %s file", "alternate-mailboxes", mh_profile); } + + if ((cp = getenv ("MHWDEBUG")) && *cp) { + for (mp = &mq; mp; mp = mp->m_next) { + fprintf (stderr, "Local- or Alternate-Mailbox: text=\"%s\" " + "mbox=\"%s\" host=\"%s\" %s\n", + mp->m_text ? mp->m_text : "", mp->m_mbox, + mp->m_host ? mp->m_host : "", + snprintb (buffer, sizeof(buffer), (unsigned) mp->m_type, + WBITS)); + } + } } if (np == NULL) /* XXX */ return 0; - switch (np->m_type) { - case NETHOST: - len = strlen (cp = LocalName ()); - if (!uprf (np->m_host, cp) || np->m_host[len] != '.') - break; - goto local_test; + /* + * Don't perform this "local" test if we have a Local-Mailbox set + */ - case UUCPHOST: - if (mh_strcasecmp (np->m_host, SystemName())) - break; /* fall */ - case LOCALHOST: + if (! localmailbox) + switch (np->m_type) { + case NETHOST: + len = strlen (cp = LocalName (0)); + if (!uprf (np->m_host, cp) || np->m_host[len] != '.') + 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 1; - break; + if (!mh_strcasecmp (np->m_mbox, mq.m_mbox)) + return 1; + break; - default: - break; - } + default: + break; + } /* * Now scan through list of alternate @@ -442,8 +430,7 @@ local_test: ; for (mp = &mq; mp->m_next;) { mp = mp->m_next; if (!np->m_mbox) - continue; - if ((len = strlen (cp = np->m_mbox)) + continue; if ((len = strlen (cp = np->m_mbox)) < (i = strlen (pp = mp->m_mbox))) continue; switch (mp->m_type & W_MBOX) {