summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2012-08-02 13:47:37 -0700
committerLance Stout <lancestout@gmail.com>2012-08-02 13:47:37 -0700
commitf81d5e4bd656fb64dd7f4285afa26e452a869a63 (patch)
treede758a6cbc60032ce40351dacda68588fab432ff
parent2f65fdbc76e46a3468d46bec7f2655a053cb5039 (diff)
parent2324c90232aa7815f130761f1215704b391415fb (diff)
downloadslixmpp-f81d5e4bd656fb64dd7f4285afa26e452a869a63.tar.gz
slixmpp-f81d5e4bd656fb64dd7f4285afa26e452a869a63.tar.bz2
slixmpp-f81d5e4bd656fb64dd7f4285afa26e452a869a63.tar.xz
slixmpp-f81d5e4bd656fb64dd7f4285afa26e452a869a63.zip
Merge branch 'master' into develop
-rw-r--r--sleekxmpp/features/feature_mechanisms/mechanisms.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/sleekxmpp/features/feature_mechanisms/mechanisms.py b/sleekxmpp/features/feature_mechanisms/mechanisms.py
index b5554181..9a391628 100644
--- 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)