diff --git a/radicale/acl/LDAP.py b/radicale/acl/LDAP.py index dd636d0..2366827 100644 --- a/radicale/acl/LDAP.py +++ b/radicale/acl/LDAP.py @@ -61,12 +61,12 @@ def has_right(owner, user, password): "LDAP bind for %s in base %s" % (distinguished_name, BASE)) if FILTER: - filterStr = "(&(%s)%s)" % (distinguished_name,FILTER) + filter_string = "(&(%s)%s)" % (distinguished_name, FILTER) else: - filterStr = distinguished_name - log.LOGGER.debug("Used LDAP filter: %s" % filterStr) + filter_string = distinguished_name + log.LOGGER.debug("Used LDAP filter: %s" % filter_string) - users = CONNEXION.search_s(BASE, SCOPE, filterStr) + users = CONNEXION.search_s(BASE, SCOPE, filter_string) if users: log.LOGGER.debug("User %s found" % user) try: diff --git a/radicale/config.py b/radicale/config.py index 23735af..faa492e 100644 --- a/radicale/config.py +++ b/radicale/config.py @@ -58,6 +58,7 @@ INITIAL_CONFIG = { "ldap_url": "ldap://localhost:389/", "ldap_base": "ou=users,dc=example,dc=com", "ldap_attribute": "uid", + "ldap_filter": "", "ldap_binddn": "", "ldap_password": "", "ldap_scope": "OneLevel",