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

diff --git a/usr/src/usr.sbin/sendmail/src/main.c b/usr/src/usr.sbin/sendmail/src/main.c
index a376639..8cf9ffe 100644 (file)
--- 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
 #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
 #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 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");
        /* 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 0fadbdc..a461d94 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/mime.c
+++ b/usr/src/usr.sbin/sendmail/src/mime.c
@@ -10,7 +10,7 @@
 # include <string.h>
 
 #ifndef lint
 # include <string.h>
 
 #ifndef lint

-static char sccsid[] = "@(#)mime.c     8.25 (Berkeley) %G%";
+static char sccsid[] = "@(#)mime.c     8.26 (Berkeley) %G%";

 #endif /* not lint */
 
 /*
 #endif /* not lint */
 
 /*


@@ -358,11 +358,13 @@ mime8to7x(mci, header, e, boundaries, flags)
 
        /*
        **  Message/* types -- recurse exactly once.
 
        /*
        **  Message/* types -- recurse exactly once.

+       **
+       **      Class 'm' is predefined to have "rfc822" only.

        */
 
        if (strcasecmp(type, "message") == 0)
        {
        */
 
        if (strcasecmp(type, "message") == 0)
        {

-               if (strcasecmp(subtype, "rfc822") != 0)
+               if (!wordinclass(subtype, 'm'))

                {
                        flags |= M87F_NO8BIT;
                }
                {
                        flags |= M87F_NO8BIT;
                }