diff options
Diffstat (limited to 'ipalib/plugins')
| -rw-r--r-- | ipalib/plugins/automount.py | 6 | ||||
| -rw-r--r-- | ipalib/plugins/baseldap.py | 14 |
2 files changed, 7 insertions, 13 deletions
diff --git a/ipalib/plugins/automount.py b/ipalib/plugins/automount.py index 7dc00224e..c0a55d5da 100644 --- a/ipalib/plugins/automount.py +++ b/ipalib/plugins/automount.py @@ -803,12 +803,10 @@ class automountkey(LDAPObject): ('cn', parent_keys[0]), self.container_dn, api.env.basedn) attrs_list = ['*'] - entries, truncated = ldap.find_entries( - sfilter, attrs_list, basedn, ldap.SCOPE_ONELEVEL) + entries = ldap.get_entries( + basedn, ldap.SCOPE_ONELEVEL, sfilter, attrs_list) if len(entries) > 1: raise errors.NotFound(reason=_('More than one entry with key %(key)s found, use --info to select specific entry.') % dict(key=pkey)) - if truncated: - raise errors.LimitsExceeded() dn = entries[0].dn return dn diff --git a/ipalib/plugins/baseldap.py b/ipalib/plugins/baseldap.py index ffc0008a6..0eae45dbd 100644 --- a/ipalib/plugins/baseldap.py +++ b/ipalib/plugins/baseldap.py @@ -684,14 +684,12 @@ class LDAPObject(Object): filter = self.backend.combine_filters( ('(member=*)', mo_filter), self.backend.MATCH_ALL) try: - result, truncated = self.backend.find_entries( - base_dn=self.api.env.basedn, + result = self.backend.get_entries( + self.api.env.basedn, filter=filter, attrs_list=['member'], size_limit=-1, # paged search will get everything anyway paged_search=True) - if truncated: - raise errors.LimitsExceeded() except errors.NotFound: result = [] @@ -709,12 +707,10 @@ class LDAPObject(Object): filter = self.backend.make_filter( {'member': dn, 'memberuser': dn, 'memberhost': dn}) try: - result, truncated = self.backend.find_entries( - base_dn=self.api.env.basedn, + result = self.backend.get_entries( + self.api.env.basedn, filter=filter, attrs_list=['']) - if truncated: - raise errors.LimitsExceeded() except errors.NotFound: result = [] @@ -2105,7 +2101,7 @@ class LDAPSearch(BaseLDAPCommand, crud.Search): result = dict( result=entries, count=len(entries), - truncated=truncated, + truncated=bool(truncated), ) if truncated: |