IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2024-12-25 08:21:05 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix filter generator in ldapapi. Shouldn't produce invalid filters anymore.

Browse Source
This commit is contained in:
Pavel Zuna 2009-04-21 15:25:48 +02:00 committed by Rob Crittenden
parent 32ad0ab011
commit 5fa7c76f72
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ipaserver/plugins/ldapapi.py
View File

@ -386,20 +386,26 @@ class ldap(CrudBackend):
del kw['scope'] del kw['scope']
if exactonly is not None: if exactonly is not None:
del kw['exactonly'] del kw['exactonly']
(exact_match_filter, partial_match_filter) = self._generate_search_filters(**kw) if kw:
(exact_match_filter, partial_match_filter) = self._generate_search_filters(**kw)
else:
(exact_match_filter, partial_match_filter) = ('', '')
if objectclass: if objectclass:
exact_match_filter = "(&(objectClass=%s)%s)" % (objectclass, exact_match_filter) exact_match_filter = '(&(objectClass=%s)%s)' % (objectclass, exact_match_filter)
partial_match_filter = "(&(objectClass=%s)%s)" % (objectclass, partial_match_filter) partial_match_filter = '(&(objectClass=%s)%s)' % (objectclass, partial_match_filter)
else:
exact_match_filter = '(&(objectClass=*)%s)' % exact_match_filter
partial_match_filter = '(&(objectClass=*)%s)' % partial_match_filter
if sfilter: if sfilter:
exact_match_filter = "(%s%s)" % (sfilter, exact_match_filter) exact_match_filter = '(%s%s)' % (sfilter, exact_match_filter)
partial_match_filter = "(%s%s)" % (sfilter, partial_match_filter) partial_match_filter = '(%s%s)' % (sfilter, partial_match_filter)
search_scope = self._get_scope(scope) search_scope = self._get_scope(scope)
if not base: if not base:
base = self.api.env.container_accounts base = self.api.env.container_accounts
search_base = "%s, %s" % (base, self.api.env.basedn) search_base = '%s,%s' % (base, self.api.env.basedn)
try: try:
exact_results = servercore.search(search_base, exact_results = servercore.search(search_base,
exact_match_filter, attributes, scope=search_scope) exact_match_filter, attributes, scope=search_scope)