Don't call sm_auth_sasl() for XAUTH2 with -sasl. Instead,

[nmh] / uip / whatnowsbr.c

diff --git a/uip/whatnowsbr.c b/uip/whatnowsbr.c
index b9518e8b8b9c7bebd3f6b30255fc8b5b9c9ea0ac..0aca3e977002df08dec503ff32e9c5b8527a00cc 100644 (file)
--- a/uip/whatnowsbr.c
+++ b/uip/whatnowsbr.c
@@ -945,12 +945,12 @@ buildfile (char **argp, char *file)
     X("draftfolder +folder", -6, SDRFSW) \
     X("draftmessage msg", -6, SDRMSW) \
     X("nodraftfolder", -3, SNDRFSW) \
     X("draftfolder +folder", -6, SDRFSW) \
     X("draftmessage msg", -6, SDRMSW) \
     X("nodraftfolder", -3, SNDRFSW) \

-    X("sasl", SASLminc(-4), SASLSW) \
-    X("nosasl", SASLminc(-6), NOSASLSW) \
-    X("saslmaxssf", SASLminc(-10), SASLMXSSFSW) \
-    X("saslmech", SASLminc(-5), SASLMECHSW) \
-    X("authservice", SASLminc(-11), AUTHSERVICESW) \
-    X("user username", SASLminc(-4), USERSW) \
+    X("sasl", SASLminc(4), SASLSW) \
+    X("nosasl", SASLminc(6), NOSASLSW) \
+    X("saslmaxssf", SASLminc(10), SASLMXSSFSW) \
+    X("saslmech", SASLminc(5), SASLMECHSW) \
+    X("authservice", SASLminc(0), AUTHSERVICESW) \
+    X("user username", SASLminc(4), USERSW) \

     X("attach fieldname", 6, SNDATTACHSW) \
     X("noattach", 0, SNDNOATTACHSW) \
     X("attachformat", 7, SNDATTACHFORMAT) \
     X("attach fieldname", 6, SNDATTACHSW) \
     X("noattach", 0, SNDNOATTACHSW) \
     X("attachformat", 7, SNDATTACHFORMAT) \