summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2014-01-07 14:29:01 +0000
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2014-09-17 12:25:19 +0100
commit5268e71e5c749f847b6ba33cc396ebfb0e83cb8e (patch)
treea1eed8150f7eafe0b37926bcc4aad84e4be7709f
parentc8fe5f59b2834f77e70340d53de711b3e789dd6d (diff)
X-TELEPATHY-PASSWORD is not mandatory if unimplementable
Gabble (correctly) doesn't implement it if you use { "account": "gmail.com" }, which is not enough for X-TELEPATHY-PASSWORD: a mechanism that provides a username, such as PLAIN or Google's OAuth dialect, must be used here. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=64354 Reviewed-by: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
-rw-r--r--spec/Channel_Interface_SASL_Authentication.xml6
1 files changed, 4 insertions, 2 deletions
diff --git a/spec/Channel_Interface_SASL_Authentication.xml b/spec/Channel_Interface_SASL_Authentication.xml
index 7985a6bd..6be975f7 100644
--- a/spec/Channel_Interface_SASL_Authentication.xml
+++ b/spec/Channel_Interface_SASL_Authentication.xml
@@ -125,8 +125,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
<p>To make it possible to implement a very simple password-querying
user interface without knowledge of any particular SASL mechanism,
implementations of this interface MUST implement the
- pseudo-mechanism <code>X-TELEPATHY-PASSWORD</code>, unless none
- of the available mechanisms use a password at all.</p>
+ pseudo-mechanism <code>X-TELEPATHY-PASSWORD</code>, unless each
+ of the available mechanisms either requires additional information
+ beyond the password (such as a username), or does not use a
+ password.</p>
</tp:docstring>
</property>