diff options
| author | Wilmer van der Gaast <wilmer@gaast.net> | 2013-01-06 23:36:17 +0000 |
|---|---|---|
| committer | Wilmer van der Gaast <wilmer@gaast.net> | 2013-01-06 23:36:17 +0000 |
| commit | 955aad87ef1f4b999d2983c75def14e87983ff62 (patch) | |
| tree | 1e4d2d87d8ff0bf0fee5423b7b3b5fd3b00d2e84 | |
| parent | a906b776ced5e28c80e78cd6ed160c43ba722c04 (diff) | |
Require StartTLS from all Jabber servers by default, like most clients do
these days.
| -rw-r--r-- | doc/user-guide/commands.xml | 6 | ||||
| -rw-r--r-- | protocols/jabber/jabber.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/doc/user-guide/commands.xml b/doc/user-guide/commands.xml index c5c9689a..a21153ef 100644 --- a/doc/user-guide/commands.xml +++ b/doc/user-guide/commands.xml @@ -1517,15 +1517,15 @@ </bitlbee-setting> <bitlbee-setting name="tls" type="boolean" scope="account"> - <default>try</default> + <default>true</default> <description> <para> - Newer Jabber servers allow clients to convert a plain-text session to a TLS/SSL-encrypted session. Normally (with this setting set to <emphasis>try</emphasis>) BitlBee will do this, if possible. + By default (with this setting enabled), BitlBee will require Jabber servers to offer encryption via StartTLS and refuse to connect if they don't. </para> <para> - If you want to force BitlBee to use TLS sessions only (and to give up if that doesn't seem to be possible) you can set this setting to <emphasis>true</emphasis>. Set it to <emphasis>false</emphasis> if you want the session to remain plain-text. + If you set this to "try", BitlBee will use StartTLS only if it's offered. With the setting disabled, StartTLS support will be ignored and avoided entirely. </para> </description> </bitlbee-setting> diff --git a/protocols/jabber/jabber.c b/protocols/jabber/jabber.c index b8d6f234..86daaa6a 100644 --- a/protocols/jabber/jabber.c +++ b/protocols/jabber/jabber.c @@ -84,7 +84,7 @@ static void jabber_init( account_t *acc ) s = set_add( &acc->set, "ssl", "false", set_eval_bool, acc ); s->flags |= ACC_SET_OFFLINE_ONLY; - s = set_add( &acc->set, "tls", "try", set_eval_tls, acc ); + s = set_add( &acc->set, "tls", "true", set_eval_tls, acc ); s->flags |= ACC_SET_OFFLINE_ONLY; s = set_add( &acc->set, "tls_verify", "true", set_eval_bool, acc ); |