X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fsend.c;h=c8b77f7a547caf74aa26a48eec2caf99442ae674;hb=fecd5d34f65597a4dfa16aeabea7d74b191532c3;hp=7eb75bdf5903f559f1202098866cda4e5d12d9f5;hpb=da304a48a24d7cc7fafae13c994d94ad3d6483f2;p=mmh

diff --git a/uip/send.c b/uip/send.c
index 7eb75bd..c8b77f7 100644
--- a/uip/send.c
+++ b/uip/send.c
@@ -2,8 +2,6 @@
 /*
  * send.c -- send a composed message
  *
- * $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.
@@ -15,18 +13,6 @@
 #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 },
@@ -102,20 +88,12 @@ static struct swit switches[] = {
     { "server host", 6 },
 #define	SNOOPSW               36
     { "snoop", 5 },
-#define SASLSW                37
-    { "sasl", SASLminc(4) },
-#define SASLMECHSW            38
-    { "saslmech mechanism", SASLminc(-5) },
-#define USERSW                39
-    { "user username", SASLminc(-4) },
 #define ATTACHSW              40
     { "attach", 6 },
 #define ATTACHFORMATSW        41
     { "attachformat", 7 },
 #define PORTSW		      42
     { "port server-port-name/number" , 4 },
-#define TLSSW		      43
-    { "tls", TLSminc(-3) },
     { NULL, 0 }
 };
 
@@ -272,8 +250,6 @@ main (int argc, char **argv)
 		case SENDSW: 
 		case SOMLSW: 
 		case SNOOPSW: 
-		case SASLSW:
-		case TLSSW:
 		    vec[vecp++] = --cp;
 		    continue;
 
@@ -282,8 +258,6 @@ main (int argc, char **argv)
 		case WIDTHSW: 
 		case CLIESW: 
 		case SERVSW: 
-		case SASLMECHSW:
-		case USERSW:
 		case PORTSW:
 		    vec[vecp++] = --cp;
 		    if (!(cp = *argp++) || *cp == '-')