Mercurial > pidgin.yaz

comparison libpurple/protocols/jabber/auth.c @ 25443:5f9a24d1c25e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove some extra trailing whitespace I noticed after merging mlundblad's xmpp branches.
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Mon, 02 Mar 2009 06:37:05 +0000
parents 5529879da454
children fcee93c74230 ae41d8e827e3
comparison
equal deleted inserted replaced
25442:13574de83636 25443:5f9a24d1c25e
382 if ((pos = strstr(js->sasl_mechs->str, js->current_mech))) { 382 if ((pos = strstr(js->sasl_mechs->str, js->current_mech))) {
383 g_string_erase(js->sasl_mechs, pos-js->sasl_mechs->str, strlen(js->current_mech)); 383 g_string_erase(js->sasl_mechs, pos-js->sasl_mechs->str, strlen(js->current_mech));
384 } 384 }
385 /* Remove space which separated this mech from the next */ 385 /* Remove space which separated this mech from the next */
386 if (strlen(js->sasl_mechs->str) > 0 && ((js->sasl_mechs->str)[0] == ' ')) { 386 if (strlen(js->sasl_mechs->str) > 0 && ((js->sasl_mechs->str)[0] == ' ')) {
387 g_string_erase(js->sasl_mechs, 0, 1); 387 g_string_erase(js->sasl_mechs, 0, 1);
388 } 388 }
389 again = TRUE; 389 again = TRUE;
390 } 390 }
391 391
392 sasl_dispose(&js->sasl); 392 sasl_dispose(&js->sasl);
395 395
396 if (js->sasl_state == SASL_CONTINUE || js->sasl_state == SASL_OK) { 396 if (js->sasl_state == SASL_CONTINUE || js->sasl_state == SASL_OK) {
397 auth = xmlnode_new("auth"); 397 auth = xmlnode_new("auth");
398 xmlnode_set_namespace(auth, "urn:ietf:params:xml:ns:xmpp-sasl"); 398 xmlnode_set_namespace(auth, "urn:ietf:params:xml:ns:xmpp-sasl");
399 xmlnode_set_attrib(auth, "mechanism", js->current_mech); 399 xmlnode_set_attrib(auth, "mechanism", js->current_mech);
400 400
401 xmlnode_set_attrib(auth, "xmlns:ga", "http://www.google.com/talk/protocol/auth"); 401 xmlnode_set_attrib(auth, "xmlns:ga", "http://www.google.com/talk/protocol/auth");
402 xmlnode_set_attrib(auth, "ga:client-uses-full-bind-result", "true"); 402 xmlnode_set_attrib(auth, "ga:client-uses-full-bind-result", "true");
403 403
404 if (clientout) { 404 if (clientout) {
405 if (coutlen == 0) { 405 if (coutlen == 0) {
1055 if ((pos = strstr(js->sasl_mechs->str, js->current_mech))) { 1055 if ((pos = strstr(js->sasl_mechs->str, js->current_mech))) {
1056 g_string_erase(js->sasl_mechs, pos-js->sasl_mechs->str, strlen(js->current_mech)); 1056 g_string_erase(js->sasl_mechs, pos-js->sasl_mechs->str, strlen(js->current_mech));
1057 } 1057 }
1058 /* Remove space which separated this mech from the next */ 1058 /* Remove space which separated this mech from the next */
1059 if (strlen(js->sasl_mechs->str) > 0 && ((js->sasl_mechs->str)[0] == ' ')) { 1059 if (strlen(js->sasl_mechs->str) > 0 && ((js->sasl_mechs->str)[0] == ' ')) {
1060 g_string_erase(js->sasl_mechs, 0, 1); 1060 g_string_erase(js->sasl_mechs, 0, 1);
1061 } 1061 }
1062 } 1062 }
1063 if (strlen(js->sasl_mechs->str)) { 1063 if (strlen(js->sasl_mechs->str)) {
1064 /* If we have remaining mechs to try, do so */ 1064 /* If we have remaining mechs to try, do so */
1065 sasl_dispose(&js->sasl); 1065 sasl_dispose(&js->sasl);
1066 1066
1067 jabber_auth_start_cyrus(js); 1067 jabber_auth_start_cyrus(js);
1068 return; 1068 return;
1069 } 1069 }
1070 } 1070 }
1071 #endif 1071 #endif