From 4e7a616835570544ea6962f4635c5bada9f008b6 Mon Sep 17 00:00:00 2001 From: gshapiro Date: Sat, 29 Mar 2003 19:18:07 +0000 Subject: Fix conflicts from sendmail 8.12.9 import --- contrib/sendmail/src/headers.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'contrib/sendmail/src/headers.c') 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 -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) -- cgit v1.1