From e815c1893d4f8118c1308cb7e306826442988863 Mon Sep 17 00:00:00 2001 From: Petr Viktorin Date: Wed, 23 Jan 2013 09:35:55 -0500 Subject: Replace deleteEntry with delete_entry Part of the work for: https://fedorahosted.org/freeipa/ticket/2660 --- ipaserver/install/krbinstance.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ipaserver/install/krbinstance.py') diff --git a/ipaserver/install/krbinstance.py b/ipaserver/install/krbinstance.py index 71490603..26de08d4 100644 --- a/ipaserver/install/krbinstance.py +++ b/ipaserver/install/krbinstance.py @@ -104,7 +104,7 @@ class KrbInstance(service.Service): service_dn = DN(('krbprincipalname', principal), self.get_realm_suffix()) service_entry = self.admin_conn.getEntry(service_dn, ldap.SCOPE_BASE) - self.admin_conn.deleteEntry(service_dn) + self.admin_conn.delete_entry(service_entry) # Create a host entry for this master host_dn = DN( @@ -263,7 +263,7 @@ class KrbInstance(service.Service): "(objectclass=nsSaslMapping)") for r in res: try: - self.admin_conn.delete_entry(r.dn) + self.admin_conn.delete_entry(r) except Exception, e: root_logger.critical( "Error during SASL mapping removal: %s", e) -- cgit