Mercurial > pidgin
comparison libpurple/protocols/jabber/jabber.c @ 30203:07f716427b50
We've already checked for the existance of the starttls node, so we know
it's gonna be there, so we don't need to check again
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Thu, 17 Jun 2010 21:04:40 +0000 |
| parents | 92a5d4b38f21 |
| children | fa311a0e51c0 |
comparison
equal
deleted
inserted
replaced
| 30202:d24c975c68a5 | 30203:07f716427b50 |
|---|---|
| 216 PurpleAccount *account; | 216 PurpleAccount *account; |
| 217 xmlnode *starttls; | 217 xmlnode *starttls; |
| 218 | 218 |
| 219 account = purple_connection_get_account(js->gc); | 219 account = purple_connection_get_account(js->gc); |
| 220 | 220 |
| 221 if((starttls = xmlnode_get_child(packet, "starttls"))) { | 221 if(purple_ssl_is_supported()) { |
| 222 if(purple_ssl_is_supported()) { | 222 jabber_send_raw(js, |
| 223 jabber_send_raw(js, | 223 "<starttls xmlns='urn:ietf:params:xml:ns:xmpp-tls'/>", -1); |
| 224 "<starttls xmlns='urn:ietf:params:xml:ns:xmpp-tls'/>", -1); | 224 return TRUE; |
| 225 return TRUE; | 225 } |
| 226 } else if(xmlnode_get_child(starttls, "required")) { | 226 |
| 227 purple_connection_error_reason(js->gc, | 227 starttls = xmlnode_get_child(packet, "starttls"); |
| 228 if(xmlnode_get_child(starttls, "required")) { | |
| 229 purple_connection_error_reason(js->gc, | |
| 228 PURPLE_CONNECTION_ERROR_NO_SSL_SUPPORT, | 230 PURPLE_CONNECTION_ERROR_NO_SSL_SUPPORT, |
| 229 _("Server requires TLS/SSL, but no TLS/SSL support was found.")); | 231 _("Server requires TLS/SSL, but no TLS/SSL support was found.")); |
| 230 return TRUE; | 232 return TRUE; |
| 231 } else if(purple_account_get_bool(account, "require_tls", JABBER_DEFAULT_REQUIRE_TLS)) { | 233 } |
| 232 purple_connection_error_reason(js->gc, | 234 |
| 233 PURPLE_CONNECTION_ERROR_NO_SSL_SUPPORT, | 235 if(purple_account_get_bool(account, "require_tls", JABBER_DEFAULT_REQUIRE_TLS)) { |
| 236 purple_connection_error_reason(js->gc, | |
| 237 PURPLE_CONNECTION_ERROR_NO_SSL_SUPPORT, | |
| 234 _("You require encryption, but no TLS/SSL support was found.")); | 238 _("You require encryption, but no TLS/SSL support was found.")); |
| 235 return TRUE; | 239 return TRUE; |
| 236 } | |
| 237 } | 240 } |
| 238 | 241 |
| 239 return FALSE; | 242 return FALSE; |
| 240 } | 243 } |
| 241 | 244 |