X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/dc5d7a6edaba9fe7306e972b926aa4766f6b58ba..592b3e1bc2a812515c5e2d01f087ec0aa2d4e8e4:/uip/post.c?ds=sidebyside

diff --git a/uip/post.c b/uip/post.c
index 8cfcf651..16121359 100644
--- a/uip/post.c
+++ b/uip/post.c
@@ -76,13 +76,12 @@
     X("server host", 6, SERVSW) /* specify alternate SMTP server */ \
     X("snoop", -5, SNOOPSW) /* snoop the SMTP transaction */ \
     X("partno", -6, PARTSW) \
-    X("queued", -6, QUEUESW) \
     X("sasl", SASLminc(-4), SASLSW) \
     X("nosasl", SASLminc(-6), NOSASLSW) \
     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) \
@@ -201,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?	 */
 
@@ -241,7 +240,6 @@ static char *serversw = NULL;
 static char prefix[] = "----- =_aaaaaaaaaa";
 
 static char *partno = NULL;
-static int queued = 0;
 
 /*
  * static prototypes
@@ -422,10 +420,6 @@ main (int argc, char **argv)
 			adios (NULL, "missing argument to %s", argp[-2]);
 		    continue;
 
-		case QUEUESW:
-		    queued++;
-		    continue;
-		
 		case SASLSW:
 		    sasl++;
 		    continue;
@@ -608,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. */
@@ -1526,8 +1535,8 @@ post (char *file, int bccque, int talk, char *envelope)
 	}
     } else {
         if (rp_isbad (retval = sm_init (clientsw, serversw, port, watch,
-                                        verbose, snoop, queued, sasl,
-                                        saslssf, saslmech, user, tls))  ||
+                                        verbose, snoop, sasl, saslssf,
+					saslmech, user, tls))  ||
             rp_isbad (retval = sm_winit (envelope)))
 	    die (NULL, "problem initializing server; %s", rp_string (retval));
 
@@ -1566,8 +1575,8 @@ verify_all_addresses (int talk, char *envelope)
 
     if (!whomsw || checksw)
 	if (rp_isbad (retval = sm_init (clientsw, serversw, port, watch,
-					verbose, snoop, queued, sasl,
-					saslssf, saslmech, user, tls))
+					verbose, snoop, sasl, saslssf,
+					saslmech, user, tls))
 		|| rp_isbad (retval = sm_winit (envelope)))
 	    die (NULL, "problem initializing server; %s", rp_string (retval));