Mercurial > pidgin

comparison libpurple/protocols/jabber/auth.c @ 17011:e44a272b27a8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge of '41f3a410baa40935d56c676abbf69c92987f86b7' and 'b8101f7594a660d5b9f9a0a1ad0e740ed9a78364'
author Nathan Walp <nwalp@pidgin.im>
date Fri, 11 May 2007 00:16:58 +0000
parents 5f557e708335
children b713af8ae274
comparison
equal deleted inserted replaced
17009:0682981f6797 17011:e44a272b27a8
289 /* If we've got a password, but aren't sending 289 /* If we've got a password, but aren't sending
290 * it in plaintext, see if we can turn on 290 * it in plaintext, see if we can turn on
291 * plaintext auth 291 * plaintext auth
292 */ 292 */
293 } else if (!plaintext) { 293 } else if (!plaintext) {
294 char *msg = g_strdup_printf(_("%s requires plaintext authentication over an unencrypted connection. Allow this and continue authentication?"),
295 js->user->domain);
294 purple_request_yes_no(js->gc, _("Plaintext Authentication"), 296 purple_request_yes_no(js->gc, _("Plaintext Authentication"),
295 _("Plaintext Authentication"), 297 _("Plaintext Authentication"),
296 _("This server requires plaintext authentication over an unencrypted connection. Allow this and continue authentication?"), 298 msg,
297 2, js->gc->account, NULL, NULL, NULL, 299 2, js->gc->account, NULL, NULL, NULL,
298 allow_cyrus_plaintext_auth, 300 allow_cyrus_plaintext_auth,
299 disallow_plaintext_auth); 301 disallow_plaintext_auth);
302 g_free(msg);
300 return; 303 return;
301 /* Everything else has failed, so fail the 304 /* Everything else has failed, so fail the
302 * connection. Should probably have a better 305 * connection. Should probably have a better
303 * error here. 306 * error here.
304 */ 307 */
475 xmlnode_free(auth); 478 xmlnode_free(auth);
476 } else if(plain) { 479 } else if(plain) {
477 js->auth_type = JABBER_AUTH_PLAIN; 480 js->auth_type = JABBER_AUTH_PLAIN;
478 481
479 if(js->gsc == NULL && !purple_account_get_bool(js->gc->account, "auth_plain_in_clear", FALSE)) { 482 if(js->gsc == NULL && !purple_account_get_bool(js->gc->account, "auth_plain_in_clear", FALSE)) {
483 char *msg = g_strdup_printf(_("%s requires plaintext authentication over an unencrypted connection. Allow this and continue authentication?"),
484 js->user->domain);
480 purple_request_yes_no(js->gc, _("Plaintext Authentication"), 485 purple_request_yes_no(js->gc, _("Plaintext Authentication"),
481 _("Plaintext Authentication"), 486 _("Plaintext Authentication"),
482 _("This server requires plaintext authentication over an unencrypted connection. Allow this and continue authentication?"), 487 msg,
483 2, 488 2,
484 purple_connection_get_account(js->gc), NULL, NULL, 489 purple_connection_get_account(js->gc), NULL, NULL,
485 purple_connection_get_account(js->gc), allow_plaintext_auth, 490 purple_connection_get_account(js->gc), allow_plaintext_auth,
486 disallow_plaintext_auth); 491 disallow_plaintext_auth);
492 g_free(msg);
487 return; 493 return;
488 } 494 }
489 finish_plaintext_authentication(js); 495 finish_plaintext_authentication(js);
490 } else { 496 } else {
491 purple_connection_error(js->gc, 497 purple_connection_error(js->gc,