From 8d92ca851c6a0d3380ddbe13c3b442adab274f93 Mon Sep 17 00:00:00 2001 From: Jan Cholasta Date: Tue, 22 Jan 2013 09:28:25 +0100 Subject: Add make_entry factory method to LDAPConnection. Replace all occurences of Entry instantiation with calls to make_entry. --- ipaserver/ipaldap.py | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'ipaserver/ipaldap.py') diff --git a/ipaserver/ipaldap.py b/ipaserver/ipaldap.py index 40d9f9e8..e3c74f83 100644 --- a/ipaserver/ipaldap.py +++ b/ipaserver/ipaldap.py @@ -961,6 +961,9 @@ class LDAPConnection(object): parent_dn = self.normalize_dn(parent_dn) return DN((primary_key, entry_attrs[primary_key]), parent_dn) + def make_entry(self, _dn=None, _obj=None, **kwargs): + return LDAPEntry(_dn, _obj, **kwargs) + # generating filters for find_entry # some examples: # f1 = ldap2.make_filter_from_attr(u'firstName', u'Pavel') @@ -1651,6 +1654,10 @@ class IPAdmin(LDAPConnection): self.__bind_with_wait(self.sasl_interactive_bind_s, timeout, None, auth_tokens) self.__lateinit() + def make_entry(self, _dn=None, _obj=None, **kwargs): + entry = super(IPAdmin, self).make_entry(_dn, _obj, **kwargs) + return Entry((entry.dn, entry)) + def getEntry(self, base, scope, filterstr='(objectClass=*)', attrlist=None): # FIXME: for backwards compatibility only -- cgit