telepathy-gabble: auth-manager: propagate failure both up and across

Will Thompson wjt at kemper.freedesktop.org
Thu Dec 6 09:56:45 PST 2012


Module: telepathy-gabble
Branch: master
Commit: 9854f7cb36f71093855af32747aea0031679cf6a
URL:    http://cgit.freedesktop.org/telepathy/telepathy-gabble/commit/?id=9854f7cb36f71093855af32747aea0031679cf6a

Author: Will Thompson <will.thompson at collabora.co.uk>
Date:   Tue Nov 20 14:45:13 2012 +0000

auth-manager: propagate failure both up and across

If we're delegating up to Wocky's internal SASL machinery, it might want
to know about the handshake failing.

If a SASL channel is open, we should let it know so that it can let its
handler know that the handshake failed.

If we're using X-TELEPATHY-PASSWORD, both these conditions are true.

---

 src/auth-manager.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/auth-manager.c b/src/auth-manager.c
index c035989..d2e1af5 100644
--- a/src/auth-manager.c
+++ b/src/auth-manager.c
@@ -489,7 +489,8 @@ gabble_auth_manager_failure (WockyAuthRegistry *registry,
     {
       gabble_server_sasl_channel_fail (self->priv->channel, error);
     }
-  else
+
+  if (self->priv->chaining_up)
     {
       void (*chain_up)(WockyAuthRegistry *, GError *) =
         WOCKY_AUTH_REGISTRY_CLASS (gabble_auth_manager_parent_class)->



More information about the telepathy-commits mailing list