X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fwhom.c;h=ad49d86a4ccb8ddb2dbdea95397aeb9426d593c4;hb=7946a8c713bd43a52229345ad0289aaa461acfb3;hp=ddf99efb2ae7d58aa3861c11eed125f019637098;hpb=5dd6771b28c257af405d7248639ed0e3bcdce38b;p=mmh

diff --git a/uip/whom.c b/uip/whom.c
index ddf99ef..ad49d86 100644
--- a/uip/whom.c
+++ b/uip/whom.c
@@ -58,6 +58,10 @@ static struct swit switches[] = {
     { "port server port name/number", 4 },
 #define TLSSW		   16
     { "tls", TLSminc(-3) },
+#define NTLSSW             17
+    { "notls", TLSminc(-5) },
+#define MTSSW		   18
+    { "mts smtp|sendmail/smtp|sendmail/pipe", 0 },
     { NULL, 0 }
 };
 
@@ -88,6 +92,9 @@ main (int argc, char **argv)
     vec[vecp++] = "-library";
     vec[vecp++] = getcpy (m_maildir (""));
 
+    /* Don't need to feed fileproc or mhlproc to post because
+       it doesn't use them when used for whom. */
+
     while ((cp = *argp++)) {
 	if (*cp == '-') {
 	    switch (smatch (++cp, switches)) {
@@ -100,15 +107,17 @@ main (int argc, char **argv)
 		case HELPSW: 
 		    snprintf (buf, sizeof(buf), "%s [switches] [file]", invo_name);
 		    print_help (buf, switches, 1);
-		    done (1);
+		    done (0);
 		case VERSIONSW:
 		    print_version(invo_name);
-		    done (1);
+		    done (0);
 
 		case CHKSW: 
 		case NOCHKSW: 
 		case SNOOPSW:
 		case SASLSW:
+		case TLSSW:
+		case NTLSSW:
 		    vec[vecp++] = --cp;
 		    continue;
 
@@ -141,6 +150,7 @@ main (int argc, char **argv)
 		case USERSW:
 		case PORTSW:
 		case SASLMECHSW:
+		case MTSSW:
 		    vec[vecp++] = --cp;
 		    if (!(cp = *argp++) || *cp == '-')
 			adios (NULL, "missing argument to %s", argp[-2]);