diff options
| author | gshapiro <gshapiro@FreeBSD.org> | 2002-08-28 17:58:45 +0000 |
|---|---|---|
| committer | gshapiro <gshapiro@FreeBSD.org> | 2002-08-28 17:58:45 +0000 |
| commit | e436d6dc2b37107ae6edaf0733704a11cf657321 (patch) | |
| tree | f1282b9585de91c06e3664800eeaa78750bf941b /contrib/sendmail/src/headers.c | |
| parent | 92d7a08e6a4f29d81a268a197c69fcd730bb4611 (diff) | |
| download | FreeBSD-src-e436d6dc2b37107ae6edaf0733704a11cf657321.zip FreeBSD-src-e436d6dc2b37107ae6edaf0733704a11cf657321.tar.gz | |
Resolve conflicts from sendmail 8.12.6 import
Diffstat (limited to 'contrib/sendmail/src/headers.c')
| -rw-r--r-- | contrib/sendmail/src/headers.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/contrib/sendmail/src/headers.c b/contrib/sendmail/src/headers.c index efb4f3c..a523a06 100644 --- a/contrib/sendmail/src/headers.c +++ b/contrib/sendmail/src/headers.c @@ -15,7 +15,7 @@ /* $FreeBSD$ */ -SM_RCSID("@(#)$Id: headers.c,v 8.266 2001/10/12 01:50:12 gshapiro Exp $") +SM_RCSID("@(#)$Id: headers.c,v 8.266.4.1 2002/08/16 14:56:01 ca Exp $") static size_t fix_mime_header __P((char *)); static int priencode __P((char *)); @@ -287,23 +287,27 @@ hse: if (bitset(pflag, CHHDR_CHECK)) { - bool stripcom = false; + int rscheckflags; char *rs; /* no ruleset? look for default */ rs = hi->hi_ruleset; + rscheckflags = RSF_COUNT; + if (!bitset(hi->hi_flags, H_FROM|H_RCPT)) + rscheckflags |= RSF_UNSTRUCTURED; if (rs == NULL) { s = stab("*", ST_HEADER, ST_FIND); if (s != NULL) { rs = (&s->s_header)->hi_ruleset; - stripcom = bitset((&s->s_header)->hi_flags, - H_STRIPCOMM); + if (bitset((&s->s_header)->hi_flags, + H_STRIPCOMM)) + rscheckflags |= RSF_RMCOMM; } } - else - stripcom = bitset(hi->hi_flags, H_STRIPCOMM); + else if (bitset(hi->hi_flags, H_STRIPCOMM)) + rscheckflags |= RSF_RMCOMM; if (rs != NULL) { int l, k; @@ -368,7 +372,7 @@ hse: #endif /* _FFR_HDR_TYPE */ macdefine(&e->e_macro, A_PERM, macid("{addr_type}"), "h"); - (void) rscheck(rs, fvalue, NULL, e, stripcom, true, 3, + (void) rscheck(rs, fvalue, NULL, e, rscheckflags, 3, NULL, e->e_id); } } |
