X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/6b6847272dc5d21ca6fcd23bf20e16193b226c0a..0e7daaa2daf6c668c8c6feb9da3c9a6639fa4e7e:/uip/send.c?ds=inline

diff --git a/uip/send.c b/uip/send.c
index 5dcdce0e..da7532a7 100644
--- a/uip/send.c
+++ b/uip/send.c
@@ -63,7 +63,6 @@
     X("snoop", 5, SNOOPSW) \
     X("sasl", SASLminc(4), SASLSW) \
     X("nosasl", SASLminc(6), NOSASLSW) \
-    X("saslmaxssf", SASLminc(6), SASLMXSSFSW) \
     X("saslmech mechanism", SASLminc(6), SASLMECHSW) \
     X("authservice", SASLminc(0), AUTHSERVICESW) \
     X("user username", SASLminc(-4), USERSW) \
@@ -74,6 +73,8 @@
     X("tls", TLSminc(-3), TLSSW) \
     X("initialtls", TLSminc(-10), INITTLSSW) \
     X("notls", TLSminc(-5), NTLSSW) \
+    X("certverify", TLSminc(-10), CERTVERSW) \
+    X("nocertverify", TLSminc(-12), NOCERTVERSW) \
     X("sendmail program", 0, MTSSM) \
     X("mts smtp|sendmail/smtp|sendmail/pipe", 2, MTSSW) \
     X("messageid localname|random", 2, MESSAGEIDSW) \
@@ -242,7 +243,8 @@ main (int argc, char **argv)
 		    continue;
 
 		case DEBUGSW: 
-		    debugsw++;	/* fall */
+		    debugsw++;
+		    /* FALLTHRU */
 		case NFILTSW: 
 		case FRMTSW: 
 		case NFRMTSW: 
@@ -257,6 +259,8 @@ main (int argc, char **argv)
 		case TLSSW:
 		case INITTLSSW:
 		case NTLSSW:
+		case CERTVERSW:
+		case NOCERTVERSW:
 		    vec[vecp++] = --cp;
 		    continue;
 
@@ -279,15 +283,14 @@ main (int argc, char **argv)
 
 		case SASLMECHSW:
 		    if (!(saslmech = *argp) || *saslmech == '-')
-			adios (NULL, "missing argument to %s", argp[-2]);
-		    /* Fall through */
+			adios (NULL, "missing argument to %s", argp[-1]);
+		    /* FALLTHRU */
 
 		case ALIASW: 
 		case FILTSW: 
 		case WIDTHSW: 
 		case CLIESW: 
 		case SERVSW: 
-		case SASLMXSSFSW:
 		case PORTSW:
 		case MTSSM:
 		case MTSSW:
@@ -320,7 +323,7 @@ main (int argc, char **argv)
     if ((cp = context_find ("Aliasfile"))) {
 	char *dp = NULL;
 
-	for (ap = brkstring(dp = getcpy(cp), " ", "\n"); ap && *ap; ap++) {
+	for (ap = brkstring(dp = mh_xstrdup(cp), " ", "\n"); ap && *ap; ap++) {
 	    vec[vecp++] = "-alias";
 	    vec[vecp++] = *ap;
 	}
@@ -379,7 +382,7 @@ main (int argc, char **argv)
 
 	for (msgp = 0, msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) {
 	    if (is_selected (mp, msgnum)) {
-		msgs[msgp++] = getcpy (m_name (msgnum));
+		msgs[msgp++] = mh_xstrdup(m_name (msgnum));
 		unset_exists (mp, msgnum);
 	    }
 	}
@@ -416,7 +419,7 @@ go_to_it:
 	    adios(NULL, "unable to create temporary file in %s",
 		  get_temp_dir());
 	}
-	distfile = getcpy (cp);
+	distfile = mh_xstrdup(cp);
 	(void) m_unlink(distfile);
 	if (link (altmsg, distfile) == NOTOK) {
 	    /* Cygwin with FAT32 filesystem produces EPERM. */
@@ -431,7 +434,7 @@ go_to_it:
 		adios(NULL, "unable to create temporary file in %s",
 		      get_temp_dir());
 	    }
-	    distfile = getcpy (cp);
+	    distfile = mh_xstrdup(cp);
 	    {
 		int in, out;
 		struct stat st;
@@ -478,11 +481,13 @@ go_to_it:
     closefds (3);
 
     for (msgnum = 0; msgnum < msgp; msgnum++) {
-	switch (sendsbr (vec, vecp, program, msgs[msgnum], &st, 1, auth_svc)) {
+        switch (sendsbr (vec, vecp, program, msgs[msgnum], &st, 1, auth_svc)) {
 	    case DONE: 
 		done (++status);
+		/* FALLTHRU */
 	    case NOTOK: 
-		status++;	/* fall */
+		status++;
+		/* FALLTHRU */
 	    case OK:
 		break;
 	}