diff options
author | Jan Cholasta <jcholast@redhat.com> | 2013-01-22 09:28:25 +0100 |
---|---|---|
committer | Martin Kosek <mkosek@redhat.com> | 2013-03-01 16:59:43 +0100 |
commit | 8d92ca851c6a0d3380ddbe13c3b442adab274f93 (patch) | |
tree | 333e840dcd564035013b5cfa31115ffe1baf9e1b /ipaserver/install/adtrustinstance.py | |
parent | d9b3c91d47b246f2bafbe290c4988d0faf3a8cea (diff) | |
download | freeipa-8d92ca851c6a0d3380ddbe13c3b442adab274f93.tar.gz freeipa-8d92ca851c6a0d3380ddbe13c3b442adab274f93.tar.xz freeipa-8d92ca851c6a0d3380ddbe13c3b442adab274f93.zip |
Add make_entry factory method to LDAPConnection.
Replace all occurences of Entry instantiation with calls to make_entry.
Diffstat (limited to 'ipaserver/install/adtrustinstance.py')
-rw-r--r-- | ipaserver/install/adtrustinstance.py | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/ipaserver/install/adtrustinstance.py b/ipaserver/install/adtrustinstance.py index cba88eb06..2391cf007 100644 --- a/ipaserver/install/adtrustinstance.py +++ b/ipaserver/install/adtrustinstance.py @@ -22,7 +22,6 @@ import errno import ldap import tempfile import uuid -from ipaserver import ipaldap from ipaserver.install import installutils from ipaserver.install import service from ipaserver.install.dsinstance import realm_to_serverid @@ -327,7 +326,7 @@ class ADTRUSTInstance(service.Service): try: self.admin_conn.getEntry(new_dn, ldap.SCOPE_BASE) except errors.NotFound: - entry = ipaldap.Entry(new_dn) + entry = self.admin_conn.make_entry(new_dn) entry.setValues("objectclass", ["nsContainer"]) try: name = new_dn[1].attr @@ -338,7 +337,7 @@ class ADTRUSTInstance(service.Service): entry.setValues("cn", name) self.admin_conn.addEntry(entry) - entry = ipaldap.Entry(self.smb_dom_dn) + entry = self.admin_conn.make_entry(self.smb_dom_dn) entry.setValues("objectclass", [self.OBJC_DOMAIN, "nsContainer"]) entry.setValues("cn", self.domain_name) entry.setValues(self.ATTR_FLAT_NAME, self.netbios_name) @@ -415,7 +414,7 @@ class ADTRUSTInstance(service.Service): ('cn', 'etc'), self.suffix) try: targets = self.admin_conn.getEntry(targets_dn, ldap.SCOPE_BASE) - current = ipaldap.Entry((targets_dn, targets.toDict())) + current = self.admin_conn.make_entry(targets_dn, targets.toDict()) members = current.getValues('memberPrincipal') or [] if not(self.cifs_principal in members): current.setValues("memberPrincipal", members + [self.cifs_principal]) @@ -447,13 +446,13 @@ class ADTRUSTInstance(service.Service): # the principal's proper dn as defined in self.cifs_agent try: entry = self.admin_conn.getEntry(self.smb_dn, ldap.SCOPE_BASE) - current = ipaldap.Entry((self.smb_dn, entry.toDict())) + current = self.admin_conn.make_entry(self.smb_dn, entry.toDict()) members = current.getValues('member') or [] if not(self.cifs_agent in members): current.setValues("member", members + [self.cifs_agent]) self.admin_conn.updateEntry(self.smb_dn, entry.toDict(), current.toDict()) except errors.NotFound: - entry = ipaldap.Entry(self.smb_dn) + entry = self.admin_conn.make_entry(self.smb_dn) entry.setValues("objectclass", ["top", "GroupOfNames"]) entry.setValues("cn", self.smb_dn['cn']) entry.setValues("member", [self.cifs_agent]) @@ -735,9 +734,9 @@ class ADTRUSTInstance(service.Service): "range.\nAdd local ID range manually and try " \ "again!") - entry = ipaldap.Entry(DN(('cn', ('%s_id_range' % self.realm)), - api.env.container_ranges, - self.suffix)) + entry = self.admin_conn.make_entry(DN(('cn', ('%s_id_range' % self.realm)), + api.env.container_ranges, + self.suffix)) entry.setValue('objectclass', 'ipaDomainIDRange') entry.setValue('cn', ('%s_id_range' % self.realm)) entry.setValue('ipaBaseID', str(base_id)) |