diff options
Diffstat (limited to 'ipaserver/install')
| -rw-r--r-- | ipaserver/install/adtrustinstance.py | 11 | ||||
| -rw-r--r-- | ipaserver/install/bindinstance.py | 4 | ||||
| -rw-r--r-- | ipaserver/install/krbinstance.py | 7 | ||||
| -rw-r--r-- | ipaserver/install/replication.py | 6 |
4 files changed, 16 insertions, 12 deletions
diff --git a/ipaserver/install/adtrustinstance.py b/ipaserver/install/adtrustinstance.py index c1121bd2..794b7880 100644 --- a/ipaserver/install/adtrustinstance.py +++ b/ipaserver/install/adtrustinstance.py @@ -704,9 +704,10 @@ class ADTRUSTInstance(service.Service): def find_local_id_range(self): self.ldap_connect() - if self.admin_conn.search_s(DN(api.env.container_ranges, self.suffix), - ldap.SCOPE_ONELEVEL, - "objectclass=ipaDomainIDRange"): + if self.admin_conn.get_entries( + DN(api.env.container_ranges, self.suffix), + ldap.SCOPE_ONELEVEL, + "(objectclass=ipaDomainIDRange)"): return try: @@ -727,8 +728,8 @@ class ADTRUSTInstance(service.Service): "(gidNumber<=%d)(gidNumner>=%d)))" % \ ((base_id - 1), (base_id + id_range_size), (base_id - 1), (base_id + id_range_size)) - if self.admin_conn.search_s("cn=accounts," + self.suffix, - ldap.SCOPE_SUBTREE, id_filter): + if self.admin_conn.get_entries(DN(('cn', 'accounts'), self.suffix), + ldap.SCOPE_SUBTREE, id_filter): raise ValueError("There are objects with IDs out of the expected" \ "range.\nAdd local ID range manually and try " \ "again!") diff --git a/ipaserver/install/bindinstance.py b/ipaserver/install/bindinstance.py index 123f559a..9c9ad648 100644 --- a/ipaserver/install/bindinstance.py +++ b/ipaserver/install/bindinstance.py @@ -167,8 +167,8 @@ def dns_container_exists(fqdn, suffix, dm_password=None, ldapi=False, realm=None """ assert isinstance(dn, DN) try: - conn.search_ext_s(dn, ldap.SCOPE_BASE) - except ldap.NO_SUCH_OBJECT: + conn.get_entry(dn) + except errors.NotFound: return False else: return True diff --git a/ipaserver/install/krbinstance.py b/ipaserver/install/krbinstance.py index f3008c91..4d91dd6f 100644 --- a/ipaserver/install/krbinstance.py +++ b/ipaserver/install/krbinstance.py @@ -258,9 +258,10 @@ class KrbInstance(service.Service): # they may conflict. try: - res = self.admin_conn.search_s(DN(('cn', 'mapping'), ('cn', 'sasl'), ('cn', 'config')), - ldap.SCOPE_ONELEVEL, - "(objectclass=nsSaslMapping)") + res = self.admin_conn.get_entries( + DN(('cn', 'mapping'), ('cn', 'sasl'), ('cn', 'config')), + ldap.SCOPE_ONELEVEL, + "(objectclass=nsSaslMapping)") for r in res: try: self.admin_conn.delete_entry(r) diff --git a/ipaserver/install/replication.py b/ipaserver/install/replication.py index 7d3f68b2..d97c5bdb 100644 --- a/ipaserver/install/replication.py +++ b/ipaserver/install/replication.py @@ -674,12 +674,14 @@ class ReplicationManager(object): while (retries > 0 ): root_logger.info('Getting ldap service principals for conversion: %s and %s' % (filter_a, filter_b)) try: - a_entry = b.search_s(self.suffix, ldap.SCOPE_SUBTREE, filterstr=filter_a) + a_entry = b.get_entries(self.suffix, ldap.SCOPE_SUBTREE, + filter=filter_a) except errors.NotFound: pass try: - b_entry = a.search_s(self.suffix, ldap.SCOPE_SUBTREE, filterstr=filter_b) + b_entry = a.get_entries(self.suffix, ldap.SCOPE_SUBTREE, + filter=filter_b) except errors.NotFound: pass |