diff options
Diffstat (limited to 'contrib/sendmail/src/savemail.c')
| -rw-r--r-- | contrib/sendmail/src/savemail.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/contrib/sendmail/src/savemail.c b/contrib/sendmail/src/savemail.c index 8e5c9d5..a5173eb 100644 --- a/contrib/sendmail/src/savemail.c +++ b/contrib/sendmail/src/savemail.c @@ -12,9 +12,11 @@ */ #ifndef lint -static char id[] = "@(#)$Id: savemail.c,v 8.212.4.11 2000/12/18 18:00:44 ca Exp $"; +static char id[] = "@(#)$Id: savemail.c,v 8.212.4.5 2000/08/22 22:46:00 gshapiro Exp $"; #endif /* ! lint */ +/* $FreeBSD$ */ + #include <sendmail.h> @@ -993,8 +995,6 @@ errbody(mci, e, separator) if (e->e_msgboundary != NULL) { - time_t now = curtime(); - putline("", mci); (void) snprintf(buf, sizeof buf, "--%s", e->e_msgboundary); putline(buf, mci); @@ -1048,13 +1048,7 @@ errbody(mci, e, separator) char *action; if (QS_IS_BADADDR(q->q_state)) - { - /* RFC 1891, 6.2.6 (b) */ - if (bitset(QHASNOTIFY, q->q_flags) && - !bitset(QPINGONFAILURE, q->q_flags)) - continue; action = "failed"; - } else if (!bitset(QPRIMARY, q->q_flags)) continue; else if (bitset(QDELIVERED, q->q_flags)) @@ -1204,7 +1198,7 @@ errbody(mci, e, separator) /* Last-Attempt-Date: -- fine granularity */ if (q->q_statdate == (time_t) 0L) - q->q_statdate = now; + q->q_statdate = curtime(); (void) snprintf(buf, sizeof buf, "Last-Attempt-Date: %s", arpadate(ctime(&q->q_statdate))); |
