Merge remote-tracking branch 'origin' into smtputf8

diff --cc Makefile.am
Simple merge

diff --cc docs/pending-release-notes
index 70ed4ff626d924c7ade9f3fd84c59bac5c1c02e3,4dfc9ec54699d5be184762d9bb87434f361e1826..f44eb066dbcd17dfbb1d9757a61301388b53082c
--- 1/docs/pending-release-notes
--- 2/docs/pending-release-notes
+++ b/docs/pending-release-notes
@@@ -48,8 -48,7 +48,10 @@@ NEW FEATURE
  - post(8) -snoop now attempts to decode base64-encoded SMTP traffic.
  - folder(1) -nocreate now prints a warning message for a non-existant folder.
  - mhfixmsg(1) now allows -decodetext binary, though 8bit is still the default.
-   RFC 6532, assuming all 8-bit message header field bodies are UTF-8.
+ - inc(1) and msgchk(1) now support TLS encryption natively.
 +- Support for SMTPUTF8 (RFC 6531) has been added.  mhshow(1) already supported
++  RFC 6532, assuming all 8-bit message header field bodies are UTF-8 and use
++  of a UTF-8 locale.
  
  -----------------
  OBSOLETE FEATURES

diff --cc mts/smtp/smtp.c
Simple merge

diff --cc mts/smtp/smtp.h
index 3063866e6396d3092d5a66c11fc06574a40cf44f,45e8c4c3213fa4c5d3c8ba11b177923560e373ac..fb842fe6f241dd1b8b52036d3808aae0f2eea1ef
--- 1/mts/smtp/smtp.h
--- 2/mts/smtp/smtp.h
+++ b/mts/smtp/smtp.h
@@@ -16,9 -16,9 +16,9 @@@ struct smtp 
   * prototypes
   */
  /* int client (); */
- int sm_init (char *, char *, char *, int, int, int, int, int, char *, char *,
-              const char *, int);
+ int sm_init (char *, char *, char *, int, int, int, int, const char *,
 -           const char *, const char *, int);
 -int sm_winit (char *);
++             const char *, const char *, int);
 +int sm_winit (char *, int);
  int sm_wadr (char *, char *, char *);
  int sm_waend (void);
  int sm_wtxt (char *, int);

diff --cc test/send/test-sendfrom
index 2d704f16e898c2e3a6ee4c3f877ffc65df119b00,8e55f7ab8fc17a749d9a026de174466a074055b8..0f2dda84ef3b29a8948844b9a3309c88fcdf6c02
--- 1/test/send/test-sendfrom
--- 2/test/send/test-sendfrom
+++ b/test/send/test-sendfrom
@@@ -51,21 -51,14 +51,23 @@@ QUI
  EOF
  
  cat > "${testname}.post-expected" <<EOF
+ Trying to connect to "127.0.0.1" ...
+ Connecting to 127.0.0.1:${localport}...
  <= 220 Not really an ESMTP server
  => EHLO nosuchhost.example.com
 +<= 250-ready
 +<= 250-8BITMIME
 +<= 250-SMTPUTF8
  <= 250 I'll buy that for a dollar!
  => MAIL FROM:<nobody@example.com>
 +<= 250-ready
 +<= 250-8BITMIME
 +<= 250-SMTPUTF8
  <= 250 I'll buy that for a dollar!
  => RCPT TO:<somebody@example.com>
 +<= 250-ready
 +<= 250-8BITMIME
 +<= 250-SMTPUTF8
  <= 250 I'll buy that for a dollar!
  => DATA
  <= 354 Go ahead

diff --cc uip/post.c
index 47941afcfe544bc78092e9ae1546874095fd7b65,0a42ad2ff429f3d57061a2937e2e79c53245ffa8..db9c02986cb078f223045c404af0588762e57fdf
--- 1/uip/post.c
--- 2/uip/post.c
+++ b/uip/post.c
@@@ -1654,13 -1626,11 +1646,12 @@@ post (char *file, int bccque, int talk
                break;
        }
      } else {
 -        if (rp_isbad (retval = sm_init (clientsw, serversw, port, watch,
 -                                        verbose, snoop, sasl, saslmech, user,
 +      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)))
 +           || rp_isbad (retval = sm_winit (envelope, eai))) {
            die (NULL, "problem initializing server; %s", rp_string (retval));
 +      }
  
          do_addresses (bccque, talk && verbose);
          if ((fd = open (file, O_RDONLY)) == NOTOK)
@@@ -1696,15 -1665,12 +1687,14 @@@ verify_all_addresses (int talk, int eai
  
      sigon ();
  
 -    if (!whomsw || checksw)
 +    if (!whomsw || checksw) {
        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)))
 +              || rp_isbad (retval = sm_winit (envelope, eai))) {
            die (NULL, "problem initializing server; %s", rp_string (retval));
 +      }
 +    }
  
      if (talk && !whomsw)
        printf (" -- Address Verification --\n");

diff --cc uip/send.c
Simple merge