Mercurial > pidgin.yaz
comparison libpurple/protocols/jabber/auth_cyrus.c @ 29097:cea22db36ffc
jabber: Use NS_XMPP_SASL
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Fri, 27 Nov 2009 20:41:22 +0000 |
parents | f3c65de7d864 |
children | 8a5252630857 |
comparison
equal
deleted
inserted
replaced
29096:d9c70a78fad5 | 29097:cea22db36ffc |
---|---|
300 } | 300 } |
301 } while (again); | 301 } while (again); |
302 | 302 |
303 if (js->sasl_state == SASL_CONTINUE || js->sasl_state == SASL_OK) { | 303 if (js->sasl_state == SASL_CONTINUE || js->sasl_state == SASL_OK) { |
304 auth = xmlnode_new("auth"); | 304 auth = xmlnode_new("auth"); |
305 xmlnode_set_namespace(auth, "urn:ietf:params:xml:ns:xmpp-sasl"); | 305 xmlnode_set_namespace(auth, NS_XMPP_SASL); |
306 xmlnode_set_attrib(auth, "mechanism", js->current_mech); | 306 xmlnode_set_attrib(auth, "mechanism", js->current_mech); |
307 | 307 |
308 xmlnode_set_attrib(auth, "xmlns:ga", "http://www.google.com/talk/protocol/auth"); | 308 xmlnode_set_attrib(auth, "xmlns:ga", "http://www.google.com/talk/protocol/auth"); |
309 xmlnode_set_attrib(auth, "ga:client-uses-full-bind-result", "true"); | 309 xmlnode_set_attrib(auth, "ga:client-uses-full-bind-result", "true"); |
310 | 310 |
437 purple_connection_error_reason(js->gc, | 437 purple_connection_error_reason(js->gc, |
438 PURPLE_CONNECTION_ERROR_NETWORK_ERROR, tmp); | 438 PURPLE_CONNECTION_ERROR_NETWORK_ERROR, tmp); |
439 g_free(tmp); | 439 g_free(tmp); |
440 } else { | 440 } else { |
441 response = xmlnode_new("response"); | 441 response = xmlnode_new("response"); |
442 xmlnode_set_namespace(response, "urn:ietf:params:xml:ns:xmpp-sasl"); | 442 xmlnode_set_namespace(response, NS_XMPP_SASL); |
443 if (clen > 0) { | 443 if (clen > 0) { |
444 /* Cyrus SASL 2.1.22 appears to contain code to add the charset | 444 /* Cyrus SASL 2.1.22 appears to contain code to add the charset |
445 * to the response for DIGEST-MD5 but there is no possibility | 445 * to the response for DIGEST-MD5 but there is no possibility |
446 * it will be executed. | 446 * it will be executed. |
447 * | 447 * |