From 3f3de618ae3f7f4650eef1302c20b9800edc0867 Mon Sep 17 00:00:00 2001 From: Simo Sorce Date: Tue, 21 Dec 2010 11:07:39 -0500 Subject: Make ipa-replica-manage del actually remove all replication agreements The previous code was removing only one agreement, leaving all other in place. This would leave dangling replication agreements once the replica is uninstalled. Fixes: https://fedorahosted.org/freeipa/ticket/624 --- ipaserver/install/replication.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'ipaserver/install') diff --git a/ipaserver/install/replication.py b/ipaserver/install/replication.py index 8d388a59..cf24f5bf 100644 --- a/ipaserver/install/replication.py +++ b/ipaserver/install/replication.py @@ -537,8 +537,10 @@ class ReplicationManager: # allow connections using two different CA certs other_conn = ipaldap.IPAdmin(other_hostname, port=oth_port, cacert=oth_cacert) try: - # For now we always require a password to set up new replica - other_conn.do_simple_bind(binddn=oth_binddn, bindpw=oth_bindpw) + if oth_bindpw: + other_conn.do_simple_bind(binddn=oth_binddn, bindpw=oth_bindpw) + else: + other_conn.sasl_interactive_bind_s('', SASL_AUTH) except Exception, e: if iswinsync: logging.info("Could not validate connection to remote server %s:%d - continuing" % -- cgit