MIME 8 to 7 bit support

[unix-history] / usr / src / usr.sbin / sendmail / src / srvrsmtp.c

diff --git a/usr/src/usr.sbin/sendmail/src/srvrsmtp.c b/usr/src/usr.sbin/sendmail/src/srvrsmtp.c
index f527460..48d6ed4 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/srvrsmtp.c
+++ b/usr/src/usr.sbin/sendmail/src/srvrsmtp.c
@@ -10,9 +10,9 @@
 
 #ifndef lint
 #ifdef SMTP
 
 #ifndef lint
 #ifdef SMTP

-static char sccsid[] = "@(#)srvrsmtp.c 8.42 (Berkeley) %G% (with SMTP)";
+static char sccsid[] = "@(#)srvrsmtp.c 8.43 (Berkeley) %G% (with SMTP)";

 #else
 #else

-static char sccsid[] = "@(#)srvrsmtp.c 8.42 (Berkeley) %G% (without SMTP)";
+static char sccsid[] = "@(#)srvrsmtp.c 8.43 (Berkeley) %G% (without SMTP)";

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


@@ -430,11 +430,11 @@ smtp(e)
                                        e->e_bodytype = newstr(vp);
                                        if (strcasecmp(vp, "8bitmime") == 0)
                                        {
                                        e->e_bodytype = newstr(vp);
                                        if (strcasecmp(vp, "8bitmime") == 0)
                                        {

-                                               SevenBit = FALSE;
+                                               SevenBitInput = FALSE;

                                        }
                                        else if (strcasecmp(vp, "7bit") == 0)
                                        {
                                        }
                                        else if (strcasecmp(vp, "7bit") == 0)
                                        {

-                                               SevenBit = TRUE;
+                                               SevenBitInput = TRUE;

                                        }
                                        else
                                        {
                                        }
                                        else
                                        {


@@ -546,7 +546,7 @@ smtp(e)
 
                        /* collect the text of the message */
                        SmtpPhase = "collect";
 
                        /* collect the text of the message */
                        SmtpPhase = "collect";

-                       collect(TRUE, doublequeue, e);
+                       collect(InChannel, TRUE, doublequeue, NULL, e);

                        if (Errors != 0)
                                goto abortmessage;
 
                        if (Errors != 0)
                                goto abortmessage;