Don't return NULL if the token is non-NULL. This is why:

2001-03-05  Jeffrey Stedfast  <fejj@ximian.com>

	* camel-sasl-plain.c (plain_challenge): Don't return NULL if the
	token is non-NULL. This is why:

	sending : AUTH PLAIN
        received: 334 ok. go on.                 <-- this is why
        sending : ZGZPaQpAZ214Lm5ldBBnb29jYXI=
        received: 235 {mp005-rz3} go ahead

	* camel-sasl.c (camel_sasl_authtype): Add the PLAIN type here.
	(camel_sasl_authtype_list): And here too.

	* camel-sasl-plain.c: Initialize the camel_sasl_plain_authtype.

	* camel-sasl-plain.h: extern the camel_sasl_plain_authtype.

svn path=/trunk/; revision=8562

1 files changed, 15 insertions, 3 deletions

diff --git a/camel/camel-sasl-plain.c b/camel/camel-sasl-plain.c
index e4e4612dc8..5fb0c97469 100644
--- a/camel/camel-sasl-plain.c
+++ b/camel/camel-sasl-plain.c
@@ -25,6 +25,16 @@
 #include "camel-service.h"
 #include <string.h>
 
+CamelServiceAuthType camel_sasl_plain_authtype = {
+	N_("PLAIN"),
+
+	N_("This option will connect to the server using a "
+	   "the PLAIN SASL mechanism if the server supports it."),
+
+	"PLAIN",
+	TRUE
+};
+
 static CamelSaslClass *parent_class = NULL;
 
 /* Returns the class for a CamelSaslPlain */
@@ -68,21 +78,23 @@ plain_challenge (CamelSasl *sasl, GByteArray *token, CamelException *ex)
 	GByteArray *buf = NULL;
 	CamelURL *url = sasl->service->url;
 
+#if 0
 	if (token) {
 		camel_exception_set (ex, CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE,
 				     _("Authentication failed."));
 		return NULL;
 	}
-
+#endif
+	
 	g_return_val_if_fail (url->passwd != NULL, NULL);
-
+	
 	/* FIXME: make sure these are "UTF8-SAFE" */
 	buf = g_byte_array_new ();
 	g_byte_array_append (buf, "", 1);
 	g_byte_array_append (buf, url->user, strlen (url->user));
 	g_byte_array_append (buf, "", 1);
 	g_byte_array_append (buf, url->passwd, strlen (url->passwd));
-
+	
 	sasl->authenticated = TRUE;
 	
 	return buf;