Changeset 955aad8

Timestamp:

2013-01-06T23:36:17Z (12 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

106f19c

Parents:

a906b77

Message:

Require StartTLS from all Jabber servers by default, like most clients do
these days.

Files:

• doc/user-guide/commands.xml (modified) (1 diff)
• protocols/jabber/jabber.c (modified) (1 diff)

doc/user-guide/commands.xml

@@ -1518 +1518 @@
 
         <bitlbee-setting name="tls" type="boolean" scope="account">
-                <default>try</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.
-                        </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.
+                <default>true</default>
+
+                <description>
+                        <para>
+                                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 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>

protocols/jabber/jabber.c

@@ -85 +85 @@
         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;