From 40d45267f08f37e0664ea3c0ab264852aeb04f29 Mon Sep 17 00:00:00 2001 From: Eric Allman Date: Sun, 18 Jun 1995 18:53:18 -0800 Subject: [PATCH] add class `m' to include message subtypes that can be treated as though rfc822 SCCS-vsn: usr.sbin/sendmail/src/mime.c 8.26 SCCS-vsn: usr.sbin/sendmail/src/main.c 8.132 --- usr/src/usr.sbin/sendmail/src/main.c | 5 ++++- usr/src/usr.sbin/sendmail/src/mime.c | 6 ++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/usr/src/usr.sbin/sendmail/src/main.c b/usr/src/usr.sbin/sendmail/src/main.c index a376639e96..8cf9ffec76 100644 --- a/usr/src/usr.sbin/sendmail/src/main.c +++ b/usr/src/usr.sbin/sendmail/src/main.c @@ -13,7 +13,7 @@ static char copyright[] = #endif /* not lint */ #ifndef lint -static char sccsid[] = "@(#)main.c 8.131 (Berkeley) %G%"; +static char sccsid[] = "@(#)main.c 8.132 (Berkeley) %G%"; #endif /* not lint */ #define _DEFINE @@ -881,6 +881,9 @@ main(argc, argv, envp) /* MIME Content-Types that cannot be transfer encoded */ setclass('n', "multipart/signed"); + /* MIME message/* subtypes that can be treated as messages */ + setclass('m', "rfc822"); + /* MIME Content-Transfer-Encodings that can be encoded */ setclass('e', "7bit"); setclass('e', "8bit"); diff --git a/usr/src/usr.sbin/sendmail/src/mime.c b/usr/src/usr.sbin/sendmail/src/mime.c index 0fadbdc0c7..a461d94409 100644 --- a/usr/src/usr.sbin/sendmail/src/mime.c +++ b/usr/src/usr.sbin/sendmail/src/mime.c @@ -10,7 +10,7 @@ # include #ifndef lint -static char sccsid[] = "@(#)mime.c 8.25 (Berkeley) %G%"; +static char sccsid[] = "@(#)mime.c 8.26 (Berkeley) %G%"; #endif /* not lint */ /* @@ -358,11 +358,13 @@ mime8to7x(mci, header, e, boundaries, flags) /* ** Message/* types -- recurse exactly once. + ** + ** Class 'm' is predefined to have "rfc822" only. */ if (strcasecmp(type, "message") == 0) { - if (strcasecmp(subtype, "rfc822") != 0) + if (!wordinclass(subtype, 'm')) { flags |= M87F_NO8BIT; } -- 2.20.1