summaryrefslogtreecommitdiff
path: root/slixmpp/features/feature_starttls/starttls.py
diff options
context:
space:
mode:
Diffstat (limited to 'slixmpp/features/feature_starttls/starttls.py')
-rw-r--r--slixmpp/features/feature_starttls/starttls.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/slixmpp/features/feature_starttls/starttls.py b/slixmpp/features/feature_starttls/starttls.py
index 4b9dd60b..a05f755b 100644
--- a/slixmpp/features/feature_starttls/starttls.py
+++ b/slixmpp/features/feature_starttls/starttls.py
@@ -52,7 +52,7 @@ class FeatureSTARTTLS(BasePlugin):
# We have already negotiated TLS, but the server is
# offering it again, against spec.
return False
- elif not self.xmpp.use_tls:
+ elif self.xmpp.disable_starttls:
return False
else:
self.xmpp.send(features['starttls'], now=True)
@@ -63,4 +63,3 @@ class FeatureSTARTTLS(BasePlugin):
log.debug("Starting TLS")
if self.xmpp.start_tls():
self.xmpp.features.add('starttls')
- raise RestartStream()