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

diff --git a/uip/whom.c b/uip/whom.c
index ddf99ef..1b1660f 100644
--- a/uip/whom.c
+++ b/uip/whom.c
@@ -11,18 +11,6 @@
 #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 },
@@ -48,16 +36,8 @@ 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 }
 };
 
@@ -108,7 +88,6 @@ main (int argc, char **argv)
 		case CHKSW: 
 		case NOCHKSW: 
 		case SNOOPSW:
-		case SASLSW:
 		    vec[vecp++] = --cp;
 		    continue;
 
@@ -138,9 +117,7 @@ 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]);