cpw.ljfisher.ssl_client_auth: eae8c20a: Enabled the EXTERNAL SASL auth mechanism...

[lucas.fisher at gmail.com]

----------------------------------------------------------------------
Revision: eae8c20ad58748e5289d6d69b76651de35147557
Parent:   6d90a006c807a328d919a2e8bda1f057950039d0
Author:   lucas.fisher at gmail.com
Date:     04/16/11 17:00:12
Branch:   im.pidgin.cpw.ljfisher.ssl_client_auth
URL: http://d.pidgin.im/viewmtn/revision/info/eae8c20ad58748e5289d6d69b76651de35147557

Changelog: 

Enabled the EXTERNAL SASL auth mechanism since it was explicitly disabled. We need it for client-side SSL/TLS auth.

Changes against parent 6d90a006c807a328d919a2e8bda1f057950039d0

  patched  libpurple/protocols/jabber/auth_cyrus.c

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/auth_cyrus.c	26b1cc9c406dab09498c887bb8f72848290f96d1
+++ libpurple/protocols/jabber/auth_cyrus.c	2b061d833e35b3a14cec8126bf3bfe1b5251e916
@@ -217,6 +217,7 @@ jabber_auth_start_cyrus(JabberStream *js
 		js->sasl_state = sasl_client_new("xmpp", js->serverFQDN, NULL, NULL, js->sasl_cb, 0, &js->sasl);
 		if (js->sasl_state==SASL_OK) {
 			sasl_setprop(js->sasl, SASL_SEC_PROPS, &secprops);
+			sasl_setprop(js->sasl, SASL_AUTH_EXTERNAL, account->username);
 			purple_debug_info("sasl", "Mechs found: %s\n", js->sasl_mechs->str);
 			js->sasl_state = sasl_client_start(js->sasl, js->sasl_mechs->str, NULL, &clientout, &coutlen, &js->current_mech);
 		}
@@ -412,8 +413,8 @@ jabber_cyrus_start(JabberStream *js, xml
 		 * Except SASL_NOMECH is supposed to mean "no concordant
 		 * mechanisms"...  Easiest just to blacklist it (for now).
 		 */
-		if (!mech_name || !*mech_name ||
-				g_str_equal(mech_name, "EXTERNAL")) {
+		if (!mech_name || !*mech_name /*||
+				g_str_equal(mech_name, "EXTERNAL")*/) {
 			g_free(mech_name);
 			continue;
 		}