diff options
Diffstat (limited to 'ipaserver')
| -rw-r--r-- | ipaserver/ipaldap.py | 4 | ||||
| -rw-r--r-- | ipaserver/plugins/ldap2.py | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/ipaserver/ipaldap.py b/ipaserver/ipaldap.py index 1162cbab..5904836d 100644 --- a/ipaserver/ipaldap.py +++ b/ipaserver/ipaldap.py @@ -1244,7 +1244,7 @@ class LDAPClient(object): return ([], []) search_entry_dn = ldap.filter.escape_filter_chars(str(entry_dn)) - attr_list = ["dn", "memberof"] + attr_list = ["memberof"] searchfilter = "(|(member=%s)(memberhost=%s)(memberuser=%s))" % ( search_entry_dn, search_entry_dn, search_entry_dn) @@ -1358,7 +1358,7 @@ class LDAPClient(object): return entries dn, group = self.get_entry( - group_dn, ['dn', 'member'], + group_dn, ['member'], size_limit=size_limit, time_limit=time_limit) real_members = group.get('member', []) diff --git a/ipaserver/plugins/ldap2.py b/ipaserver/plugins/ldap2.py index 295eddd7..360e6e2e 100644 --- a/ipaserver/plugins/ldap2.py +++ b/ipaserver/plugins/ldap2.py @@ -476,7 +476,6 @@ class ldap2(LDAPClient, CrudBackend): assert isinstance(dn, DN) (dn, entry_attrs) = self.get_entry(dn, attrs_list) - entry_attrs['dn'] = dn return entry_attrs def create(self, **kw): @@ -552,7 +551,6 @@ class ldap2(LDAPClient, CrudBackend): filter, attrs_list, base_dn, scope ) for (dn, entry_attrs) in entries: - entry_attrs['dn'] = [dn] output.append(entry_attrs) if truncated: |