diff options
author | gshapiro <gshapiro@FreeBSD.org> | 2005-06-07 04:14:59 +0000 |
---|---|---|
committer | gshapiro <gshapiro@FreeBSD.org> | 2005-06-07 04:14:59 +0000 |
commit | 125167ce170bc64dfd57dd664a3bdde3580230c7 (patch) | |
tree | 2c6b97c0946a681c9c1031038e89d298a645c754 /contrib/sendmail/src/deliver.c | |
parent | 476228659f3f241ba8be1db8703b14c5f443082a (diff) | |
download | FreeBSD-src-125167ce170bc64dfd57dd664a3bdde3580230c7.zip FreeBSD-src-125167ce170bc64dfd57dd664a3bdde3580230c7.tar.gz |
Import sendmail 8.13.4
Diffstat (limited to 'contrib/sendmail/src/deliver.c')
-rw-r--r-- | contrib/sendmail/src/deliver.c | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/contrib/sendmail/src/deliver.c b/contrib/sendmail/src/deliver.c index 96e16a3..a6b67c8 100644 --- a/contrib/sendmail/src/deliver.c +++ b/contrib/sendmail/src/deliver.c @@ -14,7 +14,7 @@ #include <sendmail.h> #include <sys/time.h> -SM_RCSID("@(#)$Id: deliver.c,v 8.983 2005/01/07 17:43:22 ca Exp $") +SM_RCSID("@(#)$Id: deliver.c,v 8.986 2005/03/05 02:28:50 ca Exp $") #if HASSETUSERCONTEXT # include <login_cap.h> @@ -4267,6 +4267,16 @@ logdelivery(m, mci, dsn, status, ctladdr, xstart, e) bp += strlen(bp); } +#if _FFR_LOG_NTRIES + /* ntries */ + if (e->e_ntries >= 0) + { + (void) sm_snprintf(bp, SPACELEFT(buf, bp), + ", ntries=%d", e->e_ntries + 1); + bp += strlen(bp); + } +#endif /* _FFR_LOG_NTRIES */ + # define STATLEN (((SYSLOG_BUFSIZE) - 100) / 4) # if (STATLEN) < 63 # undef STATLEN @@ -5673,6 +5683,10 @@ hostsignature(m, host) !(m->m_argv[0] != NULL && strcmp(m->m_argv[0], "TCP") == 0)) return "localhost"; + /* an empty host does not have MX records */ + if (*host == '\0') + return "_empty_"; + /* ** Check to see if this uses IPC -- if not, it can't have MX records. */ |