From: David Levine <levinedl@acm.org>
Date: Tue, 18 Oct 2016 20:45:30 +0000 (-0400)
Subject: Output an error message from post(8) when user specifies
X-Git-Url: https://diplodocus.org/git/nmh/commitdiff_plain/fbd42d09eb251acb237c0137823b97ab4fa1467f?hp=106540f53db1a9b8d72f5392c343b9582a445044

Output an error message from post(8) when user specifies
mhbuild -headerencoding utf-8 but the SMTP server doesn't
support SMTPUTF8.
---

diff --git a/mts/smtp/smtp.c b/mts/smtp/smtp.c
index c94ac313..8d778e5e 100644
--- a/mts/smtp/smtp.c
+++ b/mts/smtp/smtp.c
@@ -453,6 +453,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 +467,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;
         }
diff --git a/test/post/test-post-basic b/test/post/test-post-basic
index 2cd512a6..c060a16e 100755
--- a/test/post/test-post-basic
+++ b/test/post/test-post-basic
@@ -132,7 +132,6 @@ cat > "${testname}.err.expected" <<EOF
 post: SMTP server does not support 8BITMIME, not sending.
 Suggest encoding message for 7-bit transport by setting your
 locale to C, and/or specifying *b64 in mhbuild directives.
-
 post: problem initializing server; [BHST] ready; I'll buy that for a dollar!
 send: message not delivered to anyone
 EOF
diff --git a/test/post/test-rfc6531 b/test/post/test-rfc6531
index 89c6e36d..8d5391dc 100755
--- a/test/post/test-rfc6531
+++ b/test/post/test-rfc6531
@@ -77,6 +77,8 @@ RSET
 QUIT
 EOF
 cat > "${testname}.expected.err" <<EOF
+post: SMTP server does not support SMTPUTF8, not sending.
+Rebuild message with 7-bit headers, WITHOUT -headerencoding utf-8.
 post: problem initializing server; [BHST] ready; I'll buy that for a dollar!
 send: message not delivered to anyone
 EOF