Show More
@@ -109,9 +109,9 b' def authfunc(environ, username, password' | |||
|
109 | 109 | username = username.lower() |
|
110 | 110 | user_obj = user_model.get_by_username(username, cache=False, |
|
111 | 111 | case_insensitive=True) |
|
112 | if user_obj is not None: | |
|
113 |
return False |
|
|
114 | ||
|
112 | if user_obj is not None and user_obj.is_ldap is False: | |
|
113 | return False | |
|
114 | ||
|
115 | 115 | from rhodecode.model.settings import SettingsModel |
|
116 | 116 | ldap_settings = SettingsModel().get_ldap_settings() |
|
117 | 117 | |
@@ -119,7 +119,7 b' def authfunc(environ, username, password' | |||
|
119 | 119 | # FALLBACK TO LDAP AUTH IN ENABLE |
|
120 | 120 | #====================================================================== |
|
121 | 121 | if ldap_settings.get('ldap_active', False): |
|
122 | ||
|
122 | ||
|
123 | 123 | kwargs = { |
|
124 | 124 | 'server':ldap_settings.get('ldap_host', ''), |
|
125 | 125 | 'base_dn':ldap_settings.get('ldap_base_dn', ''), |
General Comments 0
You need to be logged in to leave comments.
Login now