From 8328abcdf5ef866415d3baa682acf39eb56acd0b Mon Sep 17 00:00:00 2001
From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Tue, 7 Jan 2014 14:29:01 +0000
Subject: [PATCH] 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
---
 spec/Channel_Interface_SASL_Authentication.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/spec/Channel_Interface_SASL_Authentication.xml b/spec/Channel_Interface_SASL_Authentication.xml
index 7985a6b..6be975f 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>
 
-- 
1.8.5.2