X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/641e461b10b6fd320ed6a13ec4075754d29bbb0b..d8eddf20636459cfb1558daa7382cd3feb87b78b:/mts/smtp/smtp.c

diff --git a/mts/smtp/smtp.c b/mts/smtp/smtp.c
index c94ac313..fdc56b06 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)
 
 /*
@@ -103,9 +100,9 @@ sm_init (char *client, char *server, char *port, int watch, int verbose,
     if (sm_mts == MTS_SMTP)
 	return smtp_init (client, server, port, watch, verbose,
 			  debug, sasl, saslmech, user, oauth_svc, tls);
-    else
-	return sendmail_init (client, watch, verbose, debug, sasl,
-			      saslmech, user);
+
+    return sendmail_init (client, watch, verbose, debug, sasl,
+                          saslmech, user);
 }
 
 static int
@@ -131,14 +128,13 @@ smtp_init (char *client, char *server, char *port, int watch, int verbose,
 	} else {
 	    client = LocalName(1);	/* no clientname -> LocalName */
 	}
-    }
-
-    /*
-     * Last-ditch check just in case client still isn't set to anything
-     */
 
-    if (client == NULL || *client == '\0')
-	client = "localhost";
+        /*
+         * Last-ditch check just in case client still isn't set to anything
+         */
+        if (client == NULL || *client == '\0')
+            client = "localhost";
+    }
 
     nsc = netsec_init();
 
@@ -299,14 +295,13 @@ sendmail_init (char *client, int watch, int verbose, int debug, int sasl,
 	    client = clientname;
 	else
 	    client = LocalName(1);	/* no clientname -> LocalName */
-    }
-
-    /*
-     * Last-ditch check just in case client still isn't set to anything
-     */
 
-    if (client == NULL || *client == '\0')
-	client = "localhost";
+        /*
+         * Last-ditch check just in case client still isn't set to anything
+         */
+        if (client == NULL || *client == '\0')
+            client = "localhost";
+    }
 
     nsc = netsec_init();
 
@@ -453,6 +448,9 @@ sm_winit (char *from, int smtputf8, int eightbit)
         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;
         }
@@ -464,7 +462,7 @@ sm_winit (char *from, int smtputf8, int eightbit)
         } 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.\n");
+                    "locale to C, and/or specifying *b64 in mhbuild directives.");
             sm_end (NOTOK);
             return RP_UCMD;
         }
@@ -813,7 +811,7 @@ again: ;
     						 &errstr)) != NULL ; ) {
 
 	if (doingEHLO
-	        && strncmp (buffer, "250", sizeof("250") - 1) == 0
+	        && HasPrefix(buffer, "250")
 	        && (buffer[3] == '-' || doingEHLO == 2)
 	        && buffer[4]) {
 	    if (doingEHLO == 2) {
@@ -875,7 +873,7 @@ again: ;
 	    continue;
 	if (sm_reply.code < 100) {
 	    if (sm_verbose) {
-		printf ("%s\n", sm_reply.text);
+		puts(sm_reply.text);
 		fflush (stdout);
 	    }
 	    goto again;
@@ -952,7 +950,7 @@ EHLOset (char *s)
 
     for (ehlo = EHLOkeys; *ehlo; ehlo++) {
 	ep = *ehlo;
-	if (strncmp (ep, s, len) == 0) {
+	if (HasPrefix(ep, s)) {
 	    for (ep += len; *ep == ' '; ep++)
 		continue;
 	    return ep;
@@ -1030,7 +1028,7 @@ sm_sasl_callback(enum sasl_message_type mtype, unsigned const char *indata,
 	    return NOTOK;
 	}
 
-	if (strncmp(line, "334 ", 4) != 0) {
+	if (!HasPrefix(line, "334 ")) {
 	    netsec_err(errstr, "Improper SASL protocol response: %s", line);
 	    return NOTOK;
 	}
@@ -1079,7 +1077,7 @@ sm_sasl_callback(enum sasl_message_type mtype, unsigned const char *indata,
 	if (line == NULL)
 	    return NOTOK;
 
-	if (strncmp(line, "235 ", 4) != 0) {
+	if (!HasPrefix(line, "235 ")) {
 	    if (len > 4)
 		netsec_err(errstr, "Authentication failed: %s", line + 4);
 	    else