X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/2c00d4488d86c136d4ef1dcd78cce0d23c91d736..41a82a7ecba04be5b27b3ffc813e2f34d2786a38:/uip/post.c

diff --git a/uip/post.c b/uip/post.c
index 47941afc..d385219e 100644
--- a/uip/post.c
+++ b/uip/post.c
@@ -83,7 +83,6 @@
     X("partno", -6, PARTSW) \
     X("sasl", SASLminc(4), SASLSW) \
     X("nosasl", SASLminc(6), NOSASLSW) \
-    X("saslmaxssf", SASLminc(10), SASLMXSSFSW) \
     X("saslmech", SASLminc(5), SASLMECHSW) \
     X("user", SASLminc(-4), USERSW) \
     X("port server submission port name/number", 4, PORTSW) \
@@ -157,6 +156,8 @@ struct headers {
 #define	HDCC  0x0400	/* another undocumented feature			      */
 #define HONE  0x0800	/* Only (zero or) one address allowed		      */
 #define HEFM  0x1000	/* Envelope-From: header			      */
+#define HMIM  0x2000    /* MIME-Version: header                               */
+#define HCTE  0x4000    /* Content-Transfer-Encoding: header                  */
 
 /*
  * flags for headers->set
@@ -169,7 +170,7 @@ struct headers {
 #define MSND  0x0020	/* we've seen a Sender:      */
 #define MRSN  0x0040	/* We've seen a Resent-Sendr:*/
 #define MEFM  0x0080	/* We've seen Envelope-From: */
-
+#define MMIM  0x0100    /* We've seen Mime-Version:  */
 
 static struct headers NHeaders[] = {
     { "Return-Path",   HBAD,                0 },
@@ -186,6 +187,8 @@ static struct headers NHeaders[] = {
     { "Message-ID",    HBAD,                0 },
     { "Fcc",           HFCC,                0 },
     { "Envelope-From", HADR|HONE|HEFM,      MEFM },
+    { "MIME-Version",  HMIM,                MMIM },
+    { "Content-Transfer-Encoding",  HCTE,   0 },
     { NULL,            0,                   0 }
 };
 
@@ -209,6 +212,8 @@ static struct headers RHeaders[] = {
     { "Bcc",               HADR|HTRY|HBCC|HNIL, 0 },
     { "Fcc",               HIGN,                0 },
     { "Envelope-From",     HADR|HONE|HEFM,      MEFM },
+    { "MIME-Version",      HMIM,                MMIM },
+    { "Content-Transfer-Encoding",  HCTE,       0 },
     { NULL,                0,                   0 }
 };
 
@@ -231,7 +236,6 @@ static int checksw = 0;		/* whom -check                           */
 static int linepos=0;		/* putadr()'s position on the line       */
 static int nameoutput=0;	/* putadr() has output header name       */
 static int sasl=0;		/* Use SASL auth for SMTP                */
-static int saslssf=-1;		/* Our maximum SSF for SASL              */
 static char *saslmech=NULL;	/* Force use of particular SASL mech     */
 static char *user=NULL;		/* Authenticate as this user             */
 static char *port="submission";	/* Name of server port for SMTP submission */
@@ -259,6 +263,8 @@ static char fullfrom[BUFSIZ];	/* full contents of From header  */
 static char *filter = NULL;	/* the filter for BCC'ing        */
 static char *subject = NULL;	/* the subject field for BCC'ing */
 static char *fccfold[FCCS];	/* foldernames for FCC'ing       */
+enum encoding { UNKNOWN = 0, BINARY = 1, SEVENBIT = 7, EIGHTBIT = 8 };
+static enum encoding cte = UNKNOWN;
 
 static struct headers  *hdrtab;	/* table for the message we're doing */
 
@@ -463,12 +469,6 @@ main (int argc, char **argv)
 		    sasl = 0;
 		    continue;
 
-		case SASLMXSSFSW:
-		    if (!(cp = *argp++) || *cp == '-')
-			adios (NULL, "missing argument to %s", argp[-2]);
-		    saslssf = atoi(cp);
-		    continue;
-		
 		case SASLMECHSW:
 		    if (!(saslmech = *argp++) || *saslmech == '-')
 			adios (NULL, "missing argument to %s", argp[-2]);
@@ -838,7 +838,15 @@ putfmt (char *name, char *str, int *eai, FILE *out)
 	insert_fcc (hdr, pp);
 	return;
     }
-
+    if (hdr->flags & HCTE) {
+        if (strncasecmp (str, "7bit", 4) == 0) {
+            cte = SEVENBIT;
+        } else if (strncasecmp (str, "8bit", 4) == 0) {
+            cte = EIGHTBIT;
+        } else if (strncasecmp (str, "binary", 6) == 0) {
+            cte = BINARY;
+        }
+    }
     if (!(hdr->flags & HADR)) {
 	fprintf (out, "%s: %s", name, str);
 	return;
@@ -1608,7 +1616,6 @@ static void
 post (char *file, int bccque, int talk, int eai, char *envelope,
       int oauth_flag, char *auth_svc)
 {
-    int fd;
     int	retval, i;
     pid_t child_id;
 
@@ -1654,17 +1661,33 @@ post (char *file, int bccque, int talk, int eai, char *envelope,
 		break;
 	}
     } else {
+        const int fd = open (file, O_RDONLY);
+        int eightbit = 0;
+
+        if (fd == NOTOK) {
+          die (file, "unable to re-open");
+        }
+
+        if (msgflags & MMIM  &&  cte != UNKNOWN) {
+            /* MIME message with C-T-E header.  (BINARYMIME isn't
+               supported, use 8BITMIME instead for binary.) */
+            eightbit = cte != SEVENBIT;
+        } else {
+            if (scan_input (fd, &eightbit) == NOTOK) {
+                close (fd);
+                die (file, "problem reading from");
+            }
+        }
+
 	if (rp_isbad (retval = sm_init (clientsw, serversw, port, watch,
-					verbose, snoop, sasl, saslssf,
-					saslmech, user,
+					verbose, snoop, sasl, saslmech, user,
 					oauth_flag ? auth_svc : NULL, tls))
-	     || rp_isbad (retval = sm_winit (envelope, eai))) {
+		|| rp_isbad (retval = sm_winit (envelope, eai, eightbit))) {
+	    close (fd);
 	    die (NULL, "problem initializing server; %s", rp_string (retval));
 	}
 
         do_addresses (bccque, talk && verbose);
-        if ((fd = open (file, O_RDONLY)) == NOTOK)
-          die (file, "unable to re-open");
         do_text (file, fd);
         close (fd);
         fflush (stdout);
@@ -1697,11 +1720,13 @@ verify_all_addresses (int talk, int eai, char *envelope, int oauth_flag,
     sigon ();
 
     if (!whomsw || checksw) {
+        /* Not sending message body, so don't need to use 8BITMIME. */
+        const int eightbit = 0;
+
 	if (rp_isbad (retval = sm_init (clientsw, serversw, port, watch,
-					verbose, snoop, sasl, saslssf,
-					saslmech, user,
+					verbose, snoop, sasl, saslmech, user,
 					oauth_flag ? auth_svc : NULL, tls))
-		|| rp_isbad (retval = sm_winit (envelope, eai))) {
+		|| rp_isbad (retval = sm_winit (envelope, eai, eightbit))) {
 	    die (NULL, "problem initializing server; %s", rp_string (retval));
 	}
     }