Removed SASL support. We don't need it anymore because we talk SMTP no more

[mmh] / uip / whom.c

diff --git a/uip/whom.c b/uip/whom.c
index ddf99ef..1d92ea3 100644 (file)
--- a/uip/whom.c
+++ b/uip/whom.c
@@ -11,12 +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 */
@@ -48,12 +42,6 @@ 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
@@ -108,7 +96,6 @@ main (int argc, char **argv)
                case CHKSW: 
                case NOCHKSW: 
                case SNOOPSW:
-               case SASLSW:
                    vec[vecp++] = --cp;
                    continue;
 
@@ -138,9 +125,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]);