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

diff --git a/uip/whom.c b/uip/whom.c
index 5a82534..ddf99ef 100644
--- a/uip/whom.c
+++ b/uip/whom.c
@@ -2,13 +2,27 @@
 /*
  * whom.c -- report to whom a message would be sent
  *
- * $Id$
+ * This code is Copyright (c) 2002, by the authors of nmh.  See the
+ * COPYRIGHT file in the root directory of the nmh distribution for
+ * complete copyright information.
  */
 
 #include <h/mh.h>
 #include <h/signals.h>
 #include <signal.h>
 
+#ifndef CYRUS_SASL
+# define SASLminc(a) (a)
+#else /* CYRUS_SASL */
+# define SASLminc(a)  0
+#endif /* CYRUS_SASL */
+
+#ifndef TLS_SUPPORT
+# define TLSminc(a)  (a)
+#else /* TLS_SUPPORT */
+# define TLSminc(a)   0
+#endif /* TLS_SUPPORT */
+
 static struct swit switches[] = {
 #define	ALIASW              0
     { "alias aliasfile", 0 },
@@ -27,13 +41,23 @@ static struct swit switches[] = {
 #define VERSIONSW           7
     { "version", 0 },
 #define	HELPSW              8
-    { "help", 4 },
+    { "help", 0 },
 #define	CLIESW              9
     { "client host", -6 },
 #define	SERVSW             10
     { "server host", -6 },
 #define	SNOOPSW            11
     { "snoop", -5 },
+#define SASLSW             12
+    { "sasl", SASLminc(4) },
+#define SASLMECHSW         13
+    { "saslmech mechanism", SASLminc(-5) },
+#define USERSW             14
+    { "user username", SASLminc(-4) },
+#define PORTSW		   15
+    { "port server port name/number", 4 },
+#define TLSSW		   16
+    { "tls", TLSminc(-3) },
     { NULL, 0 }
 };
 
@@ -84,6 +108,7 @@ main (int argc, char **argv)
 		case CHKSW: 
 		case NOCHKSW: 
 		case SNOOPSW:
+		case SASLSW:
 		    vec[vecp++] = --cp;
 		    continue;
 
@@ -113,6 +138,9 @@ main (int argc, char **argv)
 		case ALIASW: 
 		case CLIESW: 
 		case SERVSW: 
+		case USERSW:
+		case PORTSW:
+		case SASLMECHSW:
 		    vec[vecp++] = --cp;
 		    if (!(cp = *argp++) || *cp == '-')
 			adios (NULL, "missing argument to %s", argp[-2]);