summary refs log tree commit diff
diff options
context:
space:
mode:
authorChristoph Witzany <christoph@web.crofting.com>2016-04-06 17:04:53 +0200
committerChristoph Witzany <christoph@web.crofting.com>2016-04-06 18:23:45 +0200
commit8f0e47fae81c314f8d6e664e60d5ce5b136d99d4 (patch)
tree144518e203faa3edfc34e26d3b098965590877fa
parentadd tls property and twist my head around twisted (diff)
downloadsynapse-8f0e47fae81c314f8d6e664e60d5ce5b136d99d4.tar.xz
cleanup
-rw-r--r--synapse/rest/client/v1/login.py5
1 files changed, 0 insertions, 5 deletions
diff --git a/synapse/rest/client/v1/login.py b/synapse/rest/client/v1/login.py
index da0fd2a8e0..d14ce3efa2 100644
--- a/synapse/rest/client/v1/login.py
+++ b/synapse/rest/client/v1/login.py
@@ -107,10 +107,6 @@ class LoginRestServlet(ClientV1RestServlet):
                     "uri": "%s%s" % (self.idp_redirect_url, relay_state)
                 }
                 defer.returnValue((200, result))
-            elif self.ldap_enabled and (login_submission["type"] ==
-                                       LoginRestServlet.JWT_TYPE):
-                result = yield self.do_ldap_login(login_submission)
-                defer.returnValue(result)
             elif self.jwt_enabled and (login_submission["type"] ==
                                        LoginRestServlet.JWT_TYPE):
                 result = yield self.do_jwt_login(login_submission)
@@ -164,7 +160,6 @@ class LoginRestServlet(ClientV1RestServlet):
 
         defer.returnValue((200, result))
 
-
     @defer.inlineCallbacks
     def do_token_login(self, login_submission):
         token = login_submission['token']