- { "sasl", SASLminc(-4) },
-#define SASLMECHSW 38
- { "saslmech", SASLminc(-5) },
-#define USERSW 39
- { "user", SASLminc(-4) },
+ { "sasl", SASLminc(4) },
+#define NOSASLSW 38
+ { "nosasl", SASLminc(-6) },
+#define SASLMXSSFSW 39
+ { "saslmaxssf", SASLminc(-10) },
+#define SASLMECHSW 40
+ { "saslmech mechanism", SASLminc(-5) },
+#define USERSW 41
+ { "user username", SASLminc(-4) },
+#define ATTACHSW 42
+ { "attach", 6 },
+#define ATTACHFORMATSW 43
+ { "attachformat", 7 },
+#define PORTSW 44
+ { "port server-port-name/number" , 4 },
+#define TLSSW 45
+ { "tls", TLSminc(-3) },