X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fwhatnowsbr.c;h=ac9dc3a516790d7d565a2dc967a5b1b0573169eb;hb=703b7d98727c1f7e1e76434a04a3125d76d7d168;hp=3009e0f0ccf9065381c6374aa321cbb61a84b67f;hpb=ca34fbd0a5204d47ad019f64ef03d21ebd3397fd;p=mmh

diff --git a/uip/whatnowsbr.c b/uip/whatnowsbr.c
index 3009e0f..ac9dc3a 100644
--- a/uip/whatnowsbr.c
+++ b/uip/whatnowsbr.c
@@ -696,7 +696,7 @@ editfile (char **ed, char **arg, char *file, int use, struct msgs *mp,
     context_save ();	/* save the context file */
     fflush (stdout);
 
-    switch (pid = vfork ()) {
+    switch (pid = vfork()) {
 	case NOTOK:
 	    advise ("fork", "unable to");
 	    status = NOTOK;
@@ -811,7 +811,7 @@ copyf (char *ifile, char *ofile)
  */
 
 static int
-sendfile (char **arg, char *file, volatile int pushsw)
+sendfile (char **arg, char *file, int pushsw)
 {
     pid_t child_id;
     int i, vecp;
@@ -1054,17 +1054,21 @@ static struct swit  sendswitches[] = {
     { "nodraftfolder", -3 },
 #define SASLSW           36
     { "sasl", SASLminc(-4) },
-#define SASLMECHSW       37
+#define NOSASLSW         37
+    { "nosasl", SASLminc(-6) },
+#define SASLMXSSFSW      38
+    { "saslmaxssf", SASLminc(-10) },
+#define SASLMECHSW       39
     { "saslmech", SASLminc(-5) },
-#define USERSW           38
+#define USERSW           40
     { "user", SASLminc(-4) },
-#define SNDATTACHSW       39
+#define SNDATTACHSW       41
     { "attach file", 6 },
-#define SNDATTACHFORMAT   40
+#define SNDATTACHFORMAT   42
     { "attachformat", 7 },
-#define PORTSW		  41
+#define PORTSW		  43
     { "port server-port-name/number", 4 },
-#define TLSSW		  42
+#define TLSSW		  44
     { "tls", TLSminc(-3) },
     { NULL, 0 }
 };
@@ -1227,6 +1231,7 @@ sendit (char *sp, char **arg, char *file, int pushed)
 		case SOMLSW:
 		case SNOOPSW:
 		case SASLSW:
+		case NOSASLSW:
 		case TLSSW:
 		    vec[vecp++] = --cp;
 		    continue;
@@ -1236,6 +1241,7 @@ sendit (char *sp, char **arg, char *file, int pushed)
 		case WIDTHSW:
 		case CLIESW:
 		case SERVSW:
+		case SASLMXSSFSW:
 		case SASLMECHSW:
 		case USERSW:
 		case PORTSW:
@@ -1349,7 +1355,7 @@ whomfile (char **arg, char *file)
     context_save ();	/* save the context file */
     fflush (stdout);
 
-    switch (pid = vfork ()) {
+    switch (pid = vfork()) {
 	case NOTOK:
 	    advise ("fork", "unable to");
 	    return 1;