summaryrefslogtreecommitdiffstats
path: root/ipaserver/install/krbinstance.py
diff options
context:
space:
mode:
authorPetr Viktorin <pviktori@redhat.com>2013-01-28 12:02:48 -0500
committerMartin Kosek <mkosek@redhat.com>2013-03-01 16:59:46 +0100
commit8f44811a9570e2a0dbc821b6ca48748a5d6eace7 (patch)
treeeac02c7f1ab13894ff2e47b4757534923e3fb6a6 /ipaserver/install/krbinstance.py
parentd7bf70902b4285c40e33e426b9e16fbbbdbf8f8c (diff)
downloadfreeipa.git-8f44811a9570e2a0dbc821b6ca48748a5d6eace7.tar.gz
freeipa.git-8f44811a9570e2a0dbc821b6ca48748a5d6eace7.tar.xz
freeipa.git-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/krbinstance.py')
-rw-r--r--ipaserver/install/krbinstance.py7
1 files changed, 4 insertions, 3 deletions
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)