From: Ken Hornstein <kenh@pobox.com>
Date: Sun, 25 Nov 2012 04:50:31 +0000 (-0500)
Subject: Add support for a -nosasl switch.
X-Git-Url: http://git.marmaro.de/?p=mmh;a=commitdiff_plain;h=f2e833551241a8e085be193e80378004eeee6f51

Add support for a -nosasl switch.
---

diff --git a/man/inc.man b/man/inc.man
index 5156db8..627c20e 100644
--- 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 12da6ba..8716edd 100644
--- 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 == '-')