Note that post uses the submission port now.

diff --git a/docs/pending-release-notes b/docs/pending-release-notes
index d5337f4735698d155e8b57ac59fb9ad7554ba9be..8e85c346ff4ba514a6f87987f2a6231b6822fa16 100644 (file)
--- a/docs/pending-release-notes
+++ b/docs/pending-release-notes
@@ -7,6 +7,7 @@ NEW FEATURES
 OBSOLETE FEATURES
 -----------------
 
 OBSOLETE FEATURES
 -----------------
 

+- post now defaults to port 587 on 'smtp' message submission.

 - The undocumented -queue switch to post was deprecated in nmh 1.6, and was
   removed in this release.
 - conflict(8) was deprecated in nmh 1.6, and was removed in this release.
 - The undocumented -queue switch to post was deprecated in nmh 1.6, and was
   removed in this release.
 - conflict(8) was deprecated in nmh 1.6, and was removed in this release.

diff --git a/uip/post.c b/uip/post.c
index b940ac3a1a51adfde641c0b5b94285ca440bb2c8..ef9c88032b50de1cba18571346edafdb9ae8b8e4 100644 (file)
--- a/uip/post.c
+++ b/uip/post.c
@@ -81,7 +81,7 @@
     X("saslmaxssf", SASLminc(-10), SASLMXSSFSW) \
     X("saslmech", SASLminc(-5), SASLMECHSW) \
     X("user", SASLminc(-4), USERSW) \
     X("saslmaxssf", SASLminc(-10), SASLMXSSFSW) \
     X("saslmech", SASLminc(-5), SASLMECHSW) \
     X("user", SASLminc(-4), USERSW) \

-    X("port server port name/number", 4, PORTSW) \
+    X("port server submission port name/number", 4, PORTSW) \

     X("tls", TLSminc(-3), TLSSW) \
     X("initialtls", TLSminc(-10), INITTLSSW) \
     X("notls", TLSminc(-5), NTLSSW) \
     X("tls", TLSminc(-3), TLSSW) \
     X("initialtls", TLSminc(-10), INITTLSSW) \
     X("notls", TLSminc(-5), NTLSSW) \


@@ -200,7 +200,7 @@ 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 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="smtp";      /* Name of server port for SMTP          */
+static char *port="submission";        /* Name of server port for SMTP submission */

 static int tls=0;              /* Use TLS for encryption                */
 static int fromcount=0;                /* Count of addresses on From: header    */
 static int seensender=0;       /* Have we seen a Sender: header?        */
 static int tls=0;              /* Use TLS for encryption                */
 static int fromcount=0;                /* Count of addresses on From: header    */
 static int seensender=0;       /* Have we seen a Sender: header?        */