summaryrefslogtreecommitdiffstats
path: root/ipaserver
diff options
context:
space:
mode:
authorSimo Sorce <ssorce@redhat.com>2010-12-15 14:55:30 -0500
committerSimo Sorce <ssorce@redhat.com>2010-12-21 17:28:13 -0500
commitefd8b03ccfc5ba25c383eacafa948aa0aa5feddf (patch)
tree2922b7d3369b01aef11d7cebf187b335fcf374a2 /ipaserver
parent6bbd4eed9f4b1dcb3cb2fdc136575671832fca5f (diff)
downloadfreeipa-efd8b03ccfc5ba25c383eacafa948aa0aa5feddf.tar.gz
freeipa-efd8b03ccfc5ba25c383eacafa948aa0aa5feddf.tar.xz
freeipa-efd8b03ccfc5ba25c383eacafa948aa0aa5feddf.zip
Make ipa-replica-manage list return all known masters
if ipa-replica-manage list is given a master name as argument then the tool has the old behavior of listing that specific master replication agreements Fixes: https://fedorahosted.org/freeipa/ticket/625
Diffstat (limited to 'ipaserver')
-rw-r--r--ipaserver/install/replication.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/ipaserver/install/replication.py b/ipaserver/install/replication.py
index 000529f47..5474efdb8 100644
--- a/ipaserver/install/replication.py
+++ b/ipaserver/install/replication.py
@@ -117,7 +117,7 @@ class ReplicationManager:
return retval
- def find_replication_dns(self, conn):
+ def find_replication_agreements(self):
"""
The replication agreements are stored in
cn="$SUFFIX",cn=mapping tree,cn=config
@@ -130,10 +130,10 @@ class ReplicationManager:
"""
filt = "(|(objectclass=nsDSWindowsReplicationAgreement)(objectclass=nsds5ReplicationAgreement))"
try:
- ents = conn.search_s("cn=mapping tree,cn=config", ldap.SCOPE_SUBTREE, filt)
+ ents = self.conn.search_s("cn=mapping tree,cn=config", ldap.SCOPE_SUBTREE, filt)
except ldap.NO_SUCH_OBJECT:
- return []
- return [ent.dn for ent in ents]
+ ents = []
+ return ents
def find_ipa_replication_agreements(self):
"""