wait_for_entry: use only DN as parameter

Using the whole entry is not needed as parameter because only DN is used
and it prevents easier usage of this function

https://fedorahosted.org/freeipa/ticket/6588

Reviewed-By: Stanislav Laznicka <slaznick@redhat.com>
This commit is contained in:
Martin Basti
2017-01-18 12:55:13 +01:00
committed by David Kupka
parent a26cf0d791
commit 38fd8b356d
2 changed files with 3 additions and 5 deletions

View File

@@ -459,7 +459,7 @@ class DogtagInstance(service.Service):
ldap_uri = ipaldap.get_ldap_uri(self.master_host)
master_conn = ipaldap.LDAPClient(ldap_uri)
master_conn.gssapi_bind()
replication.wait_for_entry(master_conn, entry)
replication.wait_for_entry(master_conn, entry.dn)
del master_conn
def __remove_admin_from_group(self, group):

View File

@@ -155,7 +155,7 @@ def wait_for_task(conn, dn):
return exit_code
def wait_for_entry(connection, entry, timeout=7200, attr='', quiet=True):
def wait_for_entry(connection, dn, timeout=7200, attr='', quiet=True):
"""Wait for entry and/or attr to show up"""
filter = "(objectclass=*)"
@@ -165,8 +165,6 @@ def wait_for_entry(connection, entry, timeout=7200, attr='', quiet=True):
attrlist.append(attr)
timeout += int(time.time())
dn = entry.dn
if not quiet:
sys.stdout.write("Waiting for %s %s:%s " % (connection, dn, attr))
sys.stdout.flush()
@@ -733,7 +731,7 @@ class ReplicationManager(object):
# that we will have to set the memberof fixup task
self.need_memberof_fixup = True
wait_for_entry(a_conn, entry)
wait_for_entry(a_conn, entry.dn)
def needs_memberof_fixup(self):
return self.need_memberof_fixup