X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fwhom.c;h=fe01326f38cdc900e586a9fb11a55dc72d622c3d;hb=03bf20a885b3953a0385e814ba4e0196b46f6159;hp=5d7172e4134873e8d920f6927cf1d403ab29ab4e;hpb=017a82124bf2ea39ced5aa4c8f969c18b3c2fb90;p=mmh

diff --git a/uip/whom.c b/uip/whom.c
index 5d7172e..fe01326 100644
--- a/uip/whom.c
+++ b/uip/whom.c
@@ -3,12 +3,28 @@
  * 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 },
@@ -34,6 +50,16 @@ static struct swit switches[] = {
     { "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 +110,7 @@ main (int argc, char **argv)
 		case CHKSW: 
 		case NOCHKSW: 
 		case SNOOPSW:
+		case SASLSW:
 		    vec[vecp++] = --cp;
 		    continue;
 
@@ -113,6 +140,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]);