Add support for a -nosasl switch.

diff --git a/man/inc.man b/man/inc.man
index 5156db875f114da47d6bf779407de823a44a20a3..627c20edb98d937f1ccf2f9ef46d1b2fa70cae98 100644 (file)
--- a/man/inc.man
+++ b/man/inc.man
@@ -34,7 +34,7 @@ inc \- incorporate new mail
 .RB [ \-nopack ]
 .RB [ \-proxy
 .IR command ]
-.RB [ \-sasl ]
+.RB [ \-sasl " | " \-nosasl ]
 .RB [ \-saslmech
 .IR mechanism ]
 .RB [ \-snoop ]
@@ -320,6 +320,7 @@ switch.
 .RB ` \-changecur '
 .RB ` \-format "' defaulted as described above"
 .RB ` \-nosilent '
+.RB ` \-nosasl '
 .RB ` \-truncate "' if `" \-file " name' not given, `" \-notruncate "' otherwise"
 .RB ` \-width "' defaulted to the width of the terminal"
 .RB ` \-nopack '

diff --git a/uip/inc.c b/uip/inc.c
index 12da6ba15585ea9d988098a4f55c03b82a5b189e..8716edd8e1f14acbc11425a6549b929537a459de 100644 (file)
--- a/uip/inc.c
+++ b/uip/inc.c
@@ -89,9 +89,11 @@ static struct swit switches[] = {
     { "snoop", -5 },
 #define SASLSW                    20
     { "sasl", SASLminc(-4) },
-#define SASLMECHSW                21
+#define NOSASLSW                  21
+    { "nosasl", SASLminc(-6) },
+#define SASLMECHSW                22
     { "saslmech", SASLminc(-8) },
-#define PROXYSW                   22
+#define PROXYSW                   23
     { "proxy command", 0 },
     { NULL, 0 }
 };
@@ -359,6 +361,9 @@ main (int argc, char **argv)
            case SASLSW:
                sasl++;
                continue;
+           case NOSASLSW:
+               sasl = 0;
+               continue;
        
            case SASLMECHSW:
                if (!(saslmech = *argp++) || *saslmech == '-')