##// END OF EJS Templates
ldap: fixed regression in extracting settings after library updates....
marcink -
r2233:05c6d5d5 stable
parent child Browse files
Show More
@@ -218,7 +218,10 b' class RhodeCodeAuthPluginBase(object):'
218 else:
218 else:
219 plugin_settings = SettingsModel().get_all_settings()
219 plugin_settings = SettingsModel().get_all_settings()
220
220
221 return plugin_settings.get(full_name) or default
221 if full_name in plugin_settings:
222 return plugin_settings[full_name]
223 else:
224 return default
222
225
223 def create_or_update_setting(self, name, value):
226 def create_or_update_setting(self, name, value):
224 """
227 """
@@ -195,7 +195,7 b' class AuthLdap(object):'
195 def __init__(self, server, base_dn, port=389, bind_dn='', bind_pass='',
195 def __init__(self, server, base_dn, port=389, bind_dn='', bind_pass='',
196 tls_kind='PLAIN', tls_reqcert='DEMAND', ldap_version=3,
196 tls_kind='PLAIN', tls_reqcert='DEMAND', ldap_version=3,
197 search_scope='SUBTREE', attr_login='uid',
197 search_scope='SUBTREE', attr_login='uid',
198 ldap_filter=None):
198 ldap_filter=''):
199 if ldap == Missing:
199 if ldap == Missing:
200 raise LdapImportError("Missing or incompatible ldap library")
200 raise LdapImportError("Missing or incompatible ldap library")
201
201
General Comments 0
You need to be logged in to leave comments. Login now