X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fsend.c;h=bf689f0d4154aea72ea55ed56e23fb1d0aa1db8a;hp=2370ea4cffceef5323d4bd46550c7da5153a1779;hb=0f540a390a62d9732f61fdb21f82048093a3d63d;hpb=1691e80890e5d8ba258c51c214a3e91880e1db2b

diff --git a/uip/send.c b/uip/send.c
index 2370ea4..bf689f0 100644
--- a/uip/send.c
+++ b/uip/send.c
@@ -11,6 +11,12 @@
 #include <signal.h>
 
 
+#ifndef CYRUS_SASL
+# define SASLminc(a) (a)
+#else /* CYRUS_SASL */
+# define SASLminc(a)  0
+#endif /* CYRUS_SASL */
+
 static struct swit switches[] = {
 #define	ALIASW                 0
     { "alias aliasfile", 0 },
@@ -67,7 +73,7 @@ static struct swit switches[] = {
 #define VERSIONSW             26
     { "version", 0 },
 #define	HELPSW                27
-    { "help", 4 },
+    { "help", 0 },
 #define BITSTUFFSW            28
     { "dashstuffing", -12 },
 #define NBITSTUFFSW           29
@@ -86,6 +92,12 @@ static struct swit switches[] = {
     { "server host", -6 },
 #define	SNOOPSW               36
     { "snoop", -5 },
+#define SASLSW                37
+    { "sasl", SASLminc(-4) },
+#define SASLMECHSW            38
+    { "saslmech", SASLminc(-5) },
+#define USERSW                39
+    { "user", SASLminc(-4) },
     { NULL, 0 }
 };
 
@@ -241,6 +253,7 @@ main (int argc, char **argv)
 		case SENDSW: 
 		case SOMLSW: 
 		case SNOOPSW: 
+		case SASLSW:
 		    vec[vecp++] = --cp;
 		    continue;
 
@@ -249,6 +262,8 @@ main (int argc, char **argv)
 		case WIDTHSW: 
 		case CLIESW: 
 		case SERVSW: 
+		case SASLMECHSW:
+		case USERSW:
 		    vec[vecp++] = --cp;
 		    if (!(cp = *argp++) || *cp == '-')
 			adios (NULL, "missing argument to %s", argp[-2]);
@@ -428,5 +443,5 @@ go_to_it:
     }
 
     context_save ();	/* save the context file */
-    done (status);
+    return done (status);
 }