diff options
| author | Petr Viktorin <pviktori@redhat.com> | 2013-01-23 10:05:21 -0500 |
|---|---|---|
| committer | Martin Kosek <mkosek@redhat.com> | 2013-03-01 16:59:45 +0100 |
| commit | 5184c312f6dd1a885c9e0e10e3763eddb8110bae (patch) | |
| tree | b80d94b6fb94cb842aca6d65cc6f6be14b0ae5f0 /ipaserver/install/krbinstance.py | |
| parent | d17f9020a847c7a6db7734f1525c59efe07fbdcd (diff) | |
| download | freeipa.git-5184c312f6dd1a885c9e0e10e3763eddb8110bae.tar.gz freeipa.git-5184c312f6dd1a885c9e0e10e3763eddb8110bae.tar.xz freeipa.git-5184c312f6dd1a885c9e0e10e3763eddb8110bae.zip | |
replace getEntry with get_entry (or get_entries if scope != SCOPE_BASE)
Part of the work for: https://fedorahosted.org/freeipa/ticket/2660
Diffstat (limited to 'ipaserver/install/krbinstance.py')
| -rw-r--r-- | ipaserver/install/krbinstance.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/ipaserver/install/krbinstance.py b/ipaserver/install/krbinstance.py index 26de08d4..2380d55f 100644 --- a/ipaserver/install/krbinstance.py +++ b/ipaserver/install/krbinstance.py @@ -103,7 +103,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) + service_entry = self.admin_conn.get_entry(service_dn) self.admin_conn.delete_entry(service_entry) # Create a host entry for this master @@ -359,8 +359,10 @@ class KrbInstance(service.Service): def __write_stash_from_ds(self): try: - entry = self.admin_conn.getEntry(self.get_realm_suffix(), - ldap.SCOPE_SUBTREE) + entries = self.admin_conn.get_entries(self.get_realm_suffix(), + ldap.SCOPE_SUBTREE) + # TODO: Ensure we got only one entry + entry = entries[0] except errors.NotFound, e: root_logger.critical("Could not find master key in DS") raise e |