comparison: libpurple/protocols/jabber/auth.c
libpurple/protocols/jabber/auth.c
- branch
- cpw.resiak.disconnectreason
- changeset 21151
- 2eadc7d7c8ab
- parent 21150
- bedd1215fb5e
- child 21279
- 40685e1f50ca
equal
deleted
inserted
replaced
| 21150:bedd1215fb5e | 21151:2eadc7d7c8ab |
|---|---|
| 48 if(purple_ssl_is_supported()) { | 48 if(purple_ssl_is_supported()) { |
| 49 jabber_send_raw(js, | 49 jabber_send_raw(js, |
| 50 "<starttls xmlns='urn:ietf:params:xml:ns:xmpp-tls'/>", -1); | 50 "<starttls xmlns='urn:ietf:params:xml:ns:xmpp-tls'/>", -1); |
| 51 return TRUE; | 51 return TRUE; |
| 52 } else if(xmlnode_get_child(starttls, "required")) { | 52 } else if(xmlnode_get_child(starttls, "required")) { |
| 53 js->gc->wants_to_die = TRUE; | |
| 54 purple_connection_error_reason (js->gc, PURPLE_REASON_NO_SSL_SUPPORT, | 53 purple_connection_error_reason (js->gc, PURPLE_REASON_NO_SSL_SUPPORT, |
| 55 _("Server requires TLS/SSL for login. No TLS/SSL support found.")); | 54 _("Server requires TLS/SSL for login. No TLS/SSL support found.")); |
| 56 return TRUE; | 55 return TRUE; |
| 57 } | 56 } |
| 58 } | 57 } |
| 113 finish_plaintext_authentication(account->gc->proto_data); | 112 finish_plaintext_authentication(account->gc->proto_data); |
| 114 } | 113 } |
| 115 | 114 |
| 116 static void disallow_plaintext_auth(PurpleAccount *account) | 115 static void disallow_plaintext_auth(PurpleAccount *account) |
| 117 { | 116 { |
| 118 account->gc->wants_to_die = TRUE; | |
| 119 purple_connection_error_reason (account->gc, PURPLE_REASON_ENCRYPTION_ERROR, | 117 purple_connection_error_reason (account->gc, PURPLE_REASON_ENCRYPTION_ERROR, |
| 120 _("Server requires plaintext authentication over an unencrypted stream")); | 118 _("Server requires plaintext authentication over an unencrypted stream")); |
| 121 } | 119 } |
| 122 | 120 |
| 123 #ifdef HAVE_CYRUS_SASL | 121 #ifdef HAVE_CYRUS_SASL |
