X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/68fbd79dd7baa8211c0b1854dc5e0d6acf186ddd..f9dbb898f555a8d8914477b7b4e6cc2b18cf9457:/uip/post.c?ds=sidebyside

diff --git a/uip/post.c b/uip/post.c
index b940ac3a..685129b9 100644
--- 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("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) \
@@ -200,8 +200,8 @@ 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 char *port="smtp";	/* Name of server port for SMTP		 */
-static int tls=0;		/* Use TLS for encryption		 */
+static char *port="submission";	/* Name of server port for SMTP submission */
+static int tls=-1;		/* Use TLS for encryption		 */
 static int fromcount=0;		/* Count of addresses on From: header	 */
 static int seensender=0;	/* Have we seen a Sender: header?	 */
 
@@ -602,6 +602,21 @@ main (int argc, char **argv)
     	envelope = from;
     }
 
+    if (tls == -1) {
+#ifdef TLS_SUPPORT
+	/*
+	 * The user didn't specify any of the tls switches.  Try to
+	 * help them by implying -initialtls if they're using port 465
+	 * (smtps, until IANA revoked that registration in 1998).
+	 */
+	tls = ! strcmp (port, "465")  ||  ! strcasecmp (port, "smtps")
+	    ?  2
+	    :  0;
+#else  /* ! TLS_SUPPORT */
+	tls = 0;
+#endif /* ! TLS_SUPPORT */
+    }
+
     /* If we are doing a "whom" check */
     if (whomsw) {
 	/* This won't work with MTS_SENDMAIL_PIPE. */
@@ -699,7 +714,7 @@ putfmt (char *name, char *str, FILE *out)
     if (hdr->flags & HFCC) {
 	if ((cp = strrchr(str, '\n')))
 	    *cp = 0;
-	for (cp = pp = str; (cp = strchr(pp, ',')); pp = cp) {
+	for (pp = str; (cp = strchr(pp, ',')); pp = cp) {
 	    *cp++ = 0;
 	    insert_fcc (hdr, pp);
 	}