addresses. The routines in sbr/addrsbr.c associate semantics with those
addresses.
+ The comments below are left in for historical purposes; DUMB and
+ REALLYDUMB are now the default in the code.
+
If #ifdef DUMB is in effect, a full 822-style parser is called
for syntax recongition. This breaks each address into its components.
Note however that no semantics are assumed about the parts or their
{
char *pp;
struct mailname *mp;
-#ifndef DUMB
- char *dp;
-#endif /* not DUMB */
if (err[0]) {
if (eresult)
}
if (dfhost == NULL) {
- dfhost = LocalName ();
+ dfhost = LocalName (0);
dftype = LOCALHOST;
}
else {
mp->m_nohost = 1;
mp->m_mbox = getcpy (mbox);
-#ifdef DUMB
if (route == NULL && dftype == LOCALHOST) {
mp->m_host = NULL;
mp->m_type = dftype;
}
else
-#endif /* DUMB */
{
mp->m_host = route ? NULL : getcpy (dfhost);
mp->m_type = route ? NETHOST : dftype;
}
if (wanthost == AD_NHST)
- mp->m_type = !mh_strcasecmp (LocalName (), mp->m_host)
+ mp->m_type = !mh_strcasecmp (LocalName (0), mp->m_host)
? LOCALHOST : NETHOST;
-#ifdef DUMB
- else
- mp->m_type = mh_strcasecmp (LocalName(), mp->m_host) ? NETHOST : LOCALHOST;
-#else /* not DUMB */
else
- if (pp = OfficialName (mp->m_host)) {
- got_real_host: ;
- free (mp->m_host);
- mp->m_host = getcpy (pp);
- mp->m_type = mh_strcasecmp (LocalName(), mp->m_host) ? NETHOST : LOCALHOST;
- }
- else {
- if (dp = strchr(mp->m_host, '.')) {
- *dp = NULL;
- if (pp = OfficialName (mp->m_host))
- goto got_real_host;
- *dp = '.';
- }
- mp->m_type = BADHOST;
- }
-#endif /* not DUMB */
+ mp->m_type = mh_strcasecmp (LocalName(0), mp->m_host) ? NETHOST : LOCALHOST;
got_host: ;
if (route)
static char addr[BUFSIZ];
static char buffer[BUFSIZ];
-#ifdef DUMB
if (mp->m_nohost)
strncpy (addr, mp->m_mbox ? mp->m_mbox : "", sizeof(addr));
else
-#endif /* DUMB */
if (mp->m_type != UUCPHOST)
snprintf (addr, sizeof(addr), mp->m_host ? "%s%s@%s" : "%s%s",
/*
- * 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;
+ char *username, *domain;
static char addr[BUFSIZ];
- if (username == NULL)
- username = getusername();
+ username = getusername();
if (username_extension_masquerading) {
/* mts.conf contains "masquerade:[...]username_extension[...]", so tack
"%s%s", username, extension);
if (snprintf_return < 0 ||
- snprintf_return >= sizeof(username_with_extension))
+ snprintf_return >= (int) sizeof(username_with_extension))
adios(NULL, "snprintf() error writing username (%d chars) and"
" $USERNAME_EXTENSION (%d chars) to array of BUFSIZ (%d)"
" chars",
}
}
-#ifdef REALLYDUMB
return username;
-#endif
- if (domain == NULL)
- domain = LocalName();
+ domain = LocalName(0);
snprintf_return = snprintf (addr, sizeof(addr), "%s@%s", username, domain);
- if (snprintf_return < 0 || snprintf_return >= sizeof(addr))
+ if (snprintf_return < 0 || snprintf_return >= (int) 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);
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
* list of alternate mailboxes.
*/
if (am == NULL) {
+ if ((am = context_find ("local-mailbox"))) {
+ struct mailname *mptr;
+
+ if ((cp = getname(am)) == NULL) {
+ admonish (NULL, "Unable to find address in local-mailbox");
+ return 0;
+ }
+
+ if ((mptr = getm (cp, NULL, 0, AD_NAME, NULL)) == NULL) {
+ admonish (NULL, "invalid entry in local-mailbox: %s", cp);
+ return 0;
+ }
+
+ /*
+ * Yes, we're not freeing the whole entry, because all of those
+ * elements contain allocated pointers that we need; maybe
+ * later ...
+ */
+
+ mq = *mptr;
+
+ free(mptr);
+
+ /*
+ * 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)
+ ;
+ } else {
+ mq.m_mbox = getusername ();
+ }
+
mq.m_next = NULL;
- mq.m_mbox = getusername ();
+
if ((am = context_find ("alternate-mailboxes")) == NULL)
am = getusername();
else {
switch (np->m_type) {
case NETHOST:
- len = strlen (cp = LocalName ());
+ len = strlen (cp = LocalName (0));
if (!uprf (np->m_host, cp) || np->m_host[len] != '.')
break;
goto local_test;
projects / mmh / blobdiff