diff options
| author | Petr Viktorin <pviktori@redhat.com> | 2013-01-28 12:02:48 -0500 |
|---|---|---|
| committer | Martin Kosek <mkosek@redhat.com> | 2013-03-01 16:59:46 +0100 |
| commit | 8f44811a9570e2a0dbc821b6ca48748a5d6eace7 (patch) | |
| tree | eac02c7f1ab13894ff2e47b4757534923e3fb6a6 /ipaserver/install/adtrustinstance.py | |
| parent | d7bf70902b4285c40e33e426b9e16fbbbdbf8f8c (diff) | |
| download | freeipa-8f44811a9570e2a0dbc821b6ca48748a5d6eace7.tar.gz freeipa-8f44811a9570e2a0dbc821b6ca48748a5d6eace7.tar.xz freeipa-8f44811a9570e2a0dbc821b6ca48748a5d6eace7.zip | |
Remove search_s and search_ext_s from IPAdmin
Part of the work for: https://fedorahosted.org/freeipa/ticket/2660
Diffstat (limited to 'ipaserver/install/adtrustinstance.py')
| -rw-r--r-- | ipaserver/install/adtrustinstance.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/ipaserver/install/adtrustinstance.py b/ipaserver/install/adtrustinstance.py index c1121bd22..794b78808 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!") |