Merge branch 'master' into develop

2012-08-02 13:47:37 -07:00 · 2012-08-02 13:47:37 -07:00 · f81d5e4bd6
commit f81d5e4bd6
parent 2f65fdbc76 2324c90232
1 changed files with 2 additions and 0 deletions
--- a/sleekxmpp/features/feature_mechanisms/mechanisms.py
+++ b/sleekxmpp/features/feature_mechanisms/mechanisms.py
@ -94,6 +94,8 @@ class FeatureMechanisms(BasePlugin):
                result[value] = self.xmpp.boundjid.user
            elif value == 'password':
                result[value] = creds['password']
+            elif value == 'authzid':
+                result[value] = creds.get('authzid', '')
            elif value == 'email':
                jid = self.xmpp.boundjid.bare
                result[value] = creds.get('email', jid)