diff options
| author | gshapiro <gshapiro@FreeBSD.org> | 2003-03-29 19:18:07 +0000 |
|---|---|---|
| committer | gshapiro <gshapiro@FreeBSD.org> | 2003-03-29 19:18:07 +0000 |
| commit | 4e7a616835570544ea6962f4635c5bada9f008b6 (patch) | |
| tree | 4bfb61452aa88b2462fe6e939b84f7b84007ea5e /contrib/sendmail/src/headers.c | |
| parent | 1d6cd0b52a5c50459b966f2272a115d5bd4b535f (diff) | |
| download | FreeBSD-src-4e7a616835570544ea6962f4635c5bada9f008b6.zip FreeBSD-src-4e7a616835570544ea6962f4635c5bada9f008b6.tar.gz | |
Fix conflicts from sendmail 8.12.9 import
Diffstat (limited to 'contrib/sendmail/src/headers.c')
| -rw-r--r-- | contrib/sendmail/src/headers.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/contrib/sendmail/src/headers.c b/contrib/sendmail/src/headers.c index d9966b1..21494a3 100644 --- a/contrib/sendmail/src/headers.c +++ b/contrib/sendmail/src/headers.c @@ -9,11 +9,13 @@ * forth in the LICENSE file which can be found at the top level of * the sendmail distribution. * + * $FreeBSD$ + * */ #include <sendmail.h> -SM_RCSID("@(#)$Id: headers.c,v 8.266.4.4 2003/01/18 00:41:48 gshapiro Exp $") +SM_RCSID("@(#)$Id: headers.c,v 8.266.4.5 2003/03/12 22:42:52 gshapiro Exp $") static size_t fix_mime_header __P((HDR *, ENVELOPE *)); static int priencode __P((char *)); @@ -771,6 +773,12 @@ eatheader(e, full, log) e->e_timeoutclass = TOC_NONURGENT; } +#if _FFR_QUEUERETURN_DSN + /* If no timeoutclass picked and it's a DSN, use that timeoutclass */ + if (e->e_timeoutclass == TOC_NORMAL && bitset(EF_RESPONSE, e->e_flags)) + e->e_timeoutclass = TOC_DSN; +#endif /* _FFR_QUEUERETURN_DSN */ + /* date message originated */ p = hvalue("posted-date", e->e_header); if (p == NULL) |
