From 8f44811a9570e2a0dbc821b6ca48748a5d6eace7 Mon Sep 17 00:00:00 2001 From: Petr Viktorin Date: Mon, 28 Jan 2013 12:02:48 -0500 Subject: Remove search_s and search_ext_s from IPAdmin Part of the work for: https://fedorahosted.org/freeipa/ticket/2660 --- ipaserver/install/krbinstance.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'ipaserver/install/krbinstance.py') 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) -- cgit