summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetr Vobornik <pvoborni@redhat.com>2015-06-04 14:18:37 +0200
committerPetr Vobornik <pvoborni@redhat.com>2015-06-11 12:10:40 +0200
commit7cf82cf9aac6cc5ecb8d575ce4f141ab2afa85a2 (patch)
tree7233a702700bb944c933d15237288fe81fe61ca9
parente7ac57e1390c76c3d7fdb2710808def107d21d6d (diff)
downloadfreeipa-7cf82cf9aac6cc5ecb8d575ce4f141ab2afa85a2.tar.gz
freeipa-7cf82cf9aac6cc5ecb8d575ce4f141ab2afa85a2.tar.xz
freeipa-7cf82cf9aac6cc5ecb8d575ce4f141ab2afa85a2.zip
move replications managers group to cn=sysaccounts,cn=etc,$SUFFIX
https://fedorahosted.org/freeipa/ticket/4302 Reviewed-By: Martin Babinsky <mbabinsk@redhat.com>
-rwxr-xr-xdaemons/ipa-slapi-plugins/topology/ipa-topology-conf.ldif2
-rw-r--r--install/updates/20-replication.update2
-rw-r--r--ipaserver/install/replication.py7
3 files changed, 7 insertions, 4 deletions
diff --git a/daemons/ipa-slapi-plugins/topology/ipa-topology-conf.ldif b/daemons/ipa-slapi-plugins/topology/ipa-topology-conf.ldif
index 9b7e5ebf8..a7acb3507 100755
--- a/daemons/ipa-slapi-plugins/topology/ipa-topology-conf.ldif
+++ b/daemons/ipa-slapi-plugins/topology/ipa-topology-conf.ldif
@@ -10,7 +10,7 @@ nsslapd-pluginType: object
nsslapd-pluginEnabled: on
nsslapd-topo-plugin-shared-config-base: cn=ipa,cn=etc,$SUFFIX
nsslapd-topo-plugin-shared-replica-root: $SUFFIX
-nsslapd-topo-plugin-shared-binddngroup: cn=replication managers,cn=etc,$SUFFIX
+nsslapd-topo-plugin-shared-binddngroup: cn=replication managers,cn=sysaccounts,cn=etc,$SUFFIX
nsslapd-topo-plugin-startup-delay: 20
nsslapd-pluginId: none
nsslapd-plugin-depends-on-named: ldbm database
diff --git a/install/updates/20-replication.update b/install/updates/20-replication.update
index 01fc85033..110c3cc7c 100644
--- a/install/updates/20-replication.update
+++ b/install/updates/20-replication.update
@@ -9,5 +9,5 @@ default: nsDS5ReplicaId: 3
default: nsDS5ReplicaRoot: $SUFFIX
# Group containing replication bind dns
-dn: cn=replication managers,cn=etc,$SUFFIX
+dn: cn=replication managers,cn=sysaccounts,cn=etc,$SUFFIX
default: objectclass: groupofnames
diff --git a/ipaserver/install/replication.py b/ipaserver/install/replication.py
index 21feeb048..b367d7db8 100644
--- a/ipaserver/install/replication.py
+++ b/ipaserver/install/replication.py
@@ -416,7 +416,9 @@ class ReplicationManager(object):
assert isinstance(replica_binddn, DN)
dn = self.replica_dn()
assert isinstance(dn, DN)
- replica_groupdn = DN(('cn', 'replication managers'), ('cn', 'etc'), self.suffix)
+ replica_groupdn = DN(
+ ('cn', 'replication managers'), ('cn', 'sysaccounts'),
+ ('cn', 'etc'), self.suffix)
try:
entry = conn.get_entry(dn)
@@ -759,7 +761,8 @@ class ReplicationManager(object):
"""
rep_dn = self.replica_dn()
- group_dn = DN(('cn', 'replication managers'), ('cn', 'etc'), self.suffix)
+ group_dn = DN(('cn', 'replication managers'), ('cn', 'sysaccounts'),
+ ('cn', 'etc'), self.suffix)
assert isinstance(rep_dn, DN)
(a_dn, b_dn) = self.get_replica_principal_dns(a, b, retries=100)
assert isinstance(a_dn, DN)