X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/6663d5c1ebf7b98824d6d3e23fdecf855b647efe..cec6ee584ab027c7c536fb0bb62e768b40a4e94c:/mts/smtp/smtp.c

diff --git a/mts/smtp/smtp.c b/mts/smtp/smtp.c
index 36612006..4fe71547 100644
--- a/mts/smtp/smtp.c
+++ b/mts/smtp/smtp.c
@@ -40,9 +40,6 @@
  */
 #endif
 
-#define	TRUE	1
-#define	FALSE	0
-
 #define	NBITS ((sizeof (int)) * 8)
 
 /*
@@ -441,9 +438,39 @@ rclient (char *server, char *service)
 }
 
 int
-sm_winit (char *from)
+sm_winit (char *from, int smtputf8, int eightbit)
 {
-    switch (smtalk (SM_MAIL, "MAIL FROM:<%s>", from)) {
+    const char *mail_parameters = "";
+
+    if (smtputf8) {
+        /* Just for information, if an attempt is made to send to an 8-bit
+           address without specifying SMTPUTF8, Gmail responds with
+           555 5.5.2 Syntax error.
+           Gmail doesn't require the 8BITMIME, but RFC 6531 Sec. 1.2 does. */
+        if (EHLOset ("8BITMIME")  &&  EHLOset ("SMTPUTF8")) {
+            mail_parameters = " BODY=8BITMIME SMTPUTF8";
+        } else {
+            advise (NULL, "SMTP server does not support %s, not sending.\n"
+                    "Rebuild message with 7-bit headers, WITHOUT -headerencoding utf-8.",
+                    EHLOset ("SMTPUTF8") ? "8BITMIME" : "SMTPUTF8");
+            sm_end (NOTOK);
+            return RP_UCMD;
+        }
+    } else if (eightbit) {
+        /* Comply with RFC 6152, for messages that have any 8-bit characters
+           in their body. */
+        if (EHLOset ("8BITMIME")) {
+            mail_parameters = " BODY=8BITMIME";
+        } else {
+            advise (NULL, "SMTP server does not support 8BITMIME, not sending.\n"
+                    "Suggest encoding message for 7-bit transport by setting your\n"
+                    "locale to C, and/or specifying *b64 in mhbuild directives.");
+            sm_end (NOTOK);
+            return RP_UCMD;
+        }
+    }
+
+    switch (smtalk (SM_MAIL, "MAIL FROM:<%s>%s", from, mail_parameters)) {
 	case 250: 
 	    sm_addrs = 0;
 	    return RP_OK;
@@ -786,7 +813,7 @@ again: ;
     						 &errstr)) != NULL ; ) {
 
 	if (doingEHLO
-	        && strncmp (buffer, "250", sizeof("250") - 1) == 0
+	        && strncmp (buffer, "250", LEN("250")) == 0
 	        && (buffer[3] == '-' || doingEHLO == 2)
 	        && buffer[4]) {
 	    if (doingEHLO == 2) {
@@ -1012,7 +1039,7 @@ sm_sasl_callback(enum sasl_message_type mtype, unsigned const char *indata,
 	    *outdata = NULL;
 	    *outdatalen = 0;
 	} else {
-	    rc = decodeBase64(line + 4, (const char **) outdata, &len, 0, NULL);
+	    rc = decodeBase64(line + 4, outdata, &len, 0, NULL);
 	    if (rc != OK) {
 		netsec_err(errstr, "Unable to decode base64 response");
 		return NOTOK;