[dovecot-cvs] dovecot/src/pop3-login client-authenticate.c, 1.29, 1.30

[cras at dovecot.org]

Update of /var/lib/cvs/dovecot/src/pop3-login
In directory talvi:/tmp/cvs-serv12567/src/pop3-login

Modified Files:
	client-authenticate.c 
Log Message:
Advertise all SASL mechanisms in old-style SASL discovery. Patch by Andrey
Panin.



Index: client-authenticate.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/pop3-login/client-authenticate.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- client-authenticate.c	5 Oct 2004 16:00:18 -0000	1.29
+++ client-authenticate.c	7 Oct 2004 19:39:24 -0000	1.30
@@ -309,16 +309,19 @@
 	string_t *buf;
 	size_t argslen;
 
-	if (*args == '\0' &&
-	    auth_client_find_mech(auth_client, "NTLM") != NULL) {
-		/* This is needed to allow MS Outlook to use NTLM
-		   authentication. Sometimes this kludge is called
-		   "old-style SASL discovery". */
+	if (*args == '\0') {
+		/* Old-style SASL discovery, used by MS Outlook */
+		int i, count;
 		client_send_line(client, "+OK");
- 		client_send_line(client, "NTLM");
+		mech = auth_client_get_available_mechs(auth_client, &count);
+		for (i = 0; i < count; i++) {
+			if (mech[i].advertise) {
+		 		client_send_line(client, mech[i].name);
+			}
+		}
  		client_send_line(client, ".");
  		return TRUE;
- 	}
+	}
 
 	/* <mechanism name> <initial response> */
 	p = strchr(args, ' ');