diff options
| author | Simo Sorce <ssorce@redhat.com> | 2010-12-21 11:07:39 -0500 |
|---|---|---|
| committer | Simo Sorce <ssorce@redhat.com> | 2010-12-21 17:54:42 -0500 |
| commit | 3f3de618ae3f7f4650eef1302c20b9800edc0867 (patch) | |
| tree | 55ed3883642772286c66d09553437860fb31cc09 /ipaserver | |
| parent | ad25fc07a0fa4e24d935a1f03ef2b9d43d873c03 (diff) | |
| download | freeipa-3f3de618ae3f7f4650eef1302c20b9800edc0867.tar.gz freeipa-3f3de618ae3f7f4650eef1302c20b9800edc0867.tar.xz freeipa-3f3de618ae3f7f4650eef1302c20b9800edc0867.zip | |
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
Diffstat (limited to 'ipaserver')
| -rw-r--r-- | ipaserver/install/replication.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ipaserver/install/replication.py b/ipaserver/install/replication.py index 8d388a597..cf24f5bfd 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" % |