diff options
| author | Nathan Fritz <fritzy@netflint.net> | 2011-08-12 16:36:03 -0700 |
|---|---|---|
| committer | Nathan Fritz <fritzy@netflint.net> | 2011-08-12 16:36:03 -0700 |
| commit | 8f1d0e7a79b662e5f2849cea6e73716cc887e226 (patch) | |
| tree | ec2fe16b50effd4ba5787a57de00c514fad4f333 /sleekxmpp/features/feature_mechanisms | |
| parent | 88184ff9556774b1be3dc7fcb97f1f71803d2d61 (diff) | |
| parent | 9b7ed73f95145f88887d6fc3daa1bd2a9596b943 (diff) | |
| download | slixmpp-8f1d0e7a79b662e5f2849cea6e73716cc887e226.tar.gz slixmpp-8f1d0e7a79b662e5f2849cea6e73716cc887e226.tar.bz2 slixmpp-8f1d0e7a79b662e5f2849cea6e73716cc887e226.tar.xz slixmpp-8f1d0e7a79b662e5f2849cea6e73716cc887e226.zip | |
Merge branch 'develop' of github.com:fritzy/SleekXMPP into develop
Diffstat (limited to 'sleekxmpp/features/feature_mechanisms')
| -rw-r--r-- | sleekxmpp/features/feature_mechanisms/mechanisms.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sleekxmpp/features/feature_mechanisms/mechanisms.py b/sleekxmpp/features/feature_mechanisms/mechanisms.py index 2debf3be..a6cff0a0 100644 --- a/sleekxmpp/features/feature_mechanisms/mechanisms.py +++ b/sleekxmpp/features/feature_mechanisms/mechanisms.py @@ -29,6 +29,8 @@ class feature_mechanisms(base_plugin): self.description = "SASL Stream Feature" self.stanza = stanza + self.use_mech = self.config.get('use_mech', None) + def tls_active(): return 'starttls' in self.xmpp.features @@ -48,7 +50,8 @@ class feature_mechanisms(base_plugin): username=self.xmpp.boundjid.user, sec_query=suelta.sec_query_allow, request_values=sasl_callback, - tls_active=tls_active) + tls_active=tls_active, + mech=self.use_mech) register_stanza_plugin(StreamFeatures, stanza.Mechanisms) |