summaryrefslogtreecommitdiffstats
path: root/install
diff options
context:
space:
mode:
authorMartin Basti <mbasti@redhat.com>2014-11-10 14:13:07 +0100
committerPetr Vobornik <pvoborni@redhat.com>2014-11-13 13:31:17 +0100
commit2712b609cb1edb478aa6a55da1f6529befaa2edb (patch)
tree5793257bcd396831a0aff096ccb5590c7ec4b95a /install
parentf62c7843ffeda1e841719cb35f9f773f186780a6 (diff)
downloadfreeipa-2712b609cb1edb478aa6a55da1f6529befaa2edb.tar.gz
freeipa-2712b609cb1edb478aa6a55da1f6529befaa2edb.tar.xz
freeipa-2712b609cb1edb478aa6a55da1f6529befaa2edb.zip
Upgrade: fix trusts objectclass violationi
Execute updates in proper ordering. Curently ldap-updater implementation doesnt allow better fix. Ticket: https://fedorahosted.org/freeipa/ticket/4680 Reviewed-By: David Kupka <dkupka@redhat.com>
Diffstat (limited to 'install')
-rw-r--r--install/updates/59-trusts-sysacount.update8
-rw-r--r--install/updates/60-trusts.update6
-rw-r--r--install/updates/Makefile.am1
3 files changed, 9 insertions, 6 deletions
diff --git a/install/updates/59-trusts-sysacount.update b/install/updates/59-trusts-sysacount.update
new file mode 100644
index 000000000..b90de80d2
--- /dev/null
+++ b/install/updates/59-trusts-sysacount.update
@@ -0,0 +1,8 @@
+# this update must be applied before 60-trusts.update, because current
+# implementation of ipa-ldap-updater doesn't keep the order of updates in
+# filesets
+dn: cn=adtrust agents,cn=sysaccounts,cn=etc,$SUFFIX
+add: objectClass: nestedgroup
+default: objectClass: GroupOfNames
+default: objectClass: top
+default: cn: adtrust agents
diff --git a/install/updates/60-trusts.update b/install/updates/60-trusts.update
index 9dabc806e..79caa837a 100644
--- a/install/updates/60-trusts.update
+++ b/install/updates/60-trusts.update
@@ -10,12 +10,6 @@ default: member: uid=admin,cn=users,cn=accounts,$SUFFIX
default: nsAccountLock: FALSE
default: ipaUniqueID: autogenerate
-dn: cn=adtrust agents,cn=sysaccounts,cn=etc,$SUFFIX
-add: objectClass: nestedgroup
-default: objectClass: GroupOfNames
-default: objectClass: top
-default: cn: adtrust agents
-
dn: cn=ADTrust Agents,cn=privileges,cn=pbac,$SUFFIX
default: objectClass: top
default: objectClass: groupofnames
diff --git a/install/updates/Makefile.am b/install/updates/Makefile.am
index 2bd877a0d..40de56356 100644
--- a/install/updates/Makefile.am
+++ b/install/updates/Makefile.am
@@ -42,6 +42,7 @@ app_DATA = \
50-nis.update \
50-ipaconfig.update \
55-pbacmemberof.update \
+ 59-trusts-sysacount.update \
60-trusts.update \
61-trusts-s4u2proxy.update \
62-ranges.update \