X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fwhatnowsbr.c;h=cf577927fecd677817c6f6afa4b7705ba5f9d230;hb=ef25ef28586541f0804dc6aa53a8519cf762ba6d;hp=854a97258db4eedac03f85e0f948789275add19d;hpb=3c9700d8d045f3ff26ce5dd2a174454dafc14822;p=mmh

diff --git a/uip/whatnowsbr.c b/uip/whatnowsbr.c
index 854a972..cf57792 100644
--- a/uip/whatnowsbr.c
+++ b/uip/whatnowsbr.c
@@ -26,7 +26,7 @@ static struct swit whatnowswitches[] = {
 #define VERSIONSW               6
     { "version", 0 },
 #define	HELPSW                  7
-    { "help", 4 },
+    { "help", 0 },
     { NULL, 0 }
 };
 
@@ -607,6 +607,12 @@ check_draft (char *msgnam)
 }
 
 
+#ifndef CYRUS_SASL
+# define SASLminc(a) (a)
+#else /* CYRUS_SASL */
+# define SASLminc(a)  0
+#endif /* CYRUS_SASL */
+
 static struct swit  sendswitches[] = {
 #define	ALIASW            0
     { "alias aliasfile", 0 },
@@ -655,7 +661,7 @@ static struct swit  sendswitches[] = {
 #define SVERSIONSW       22
     { "version", 0 },
 #define	SHELPSW          23
-    { "help", 4 },
+    { "help", 0 },
 #define BITSTUFFSW       24
     { "dashstuffing", -12 },
 #define NBITSTUFFSW      25
@@ -680,6 +686,12 @@ static struct swit  sendswitches[] = {
     { "draftmessage msg", -6 },
 #define SNDRFSW          35
     { "nodraftfolder", -3 },
+#define SASLSW           36
+    { "sasl", SASLminc(-4) },
+#define SASLMECHSW       37
+    { "saslmech", SASLminc(-5) },
+#define USERSW           38
+    { "user", SASLminc(-4) },
     { NULL, 0 }
 };
 
@@ -830,6 +842,7 @@ sendit (char *sp, char **arg, char *file, int pushed)
 		case SSNDSW: 
 		case SOMLSW: 
 		case SNOOPSW: 
+		case SASLSW:
 		    vec[vecp++] = --cp;
 		    continue;
 
@@ -838,6 +851,8 @@ sendit (char *sp, char **arg, char *file, int pushed)
 		case WIDTHSW: 
 		case CLIESW: 
 		case SERVSW: 
+		case SASLMECHSW:
+		case USERSW:
 		    vec[vecp++] = --cp;
 		    if (!(cp = *argp++) || *cp == '-') {
 			advise (NULL, "missing argument to %s", argp[-2]);