|
 |
a6e2d8 |
From 14dbf04148c6284b176eca34aa70df4bef09b857 Mon Sep 17 00:00:00 2001
|
|
|
a6e2d8 |
From: Alexander Bokovoy <abokovoy@redhat.com>
|
|
|
a6e2d8 |
Date: Feb 12 2020 14:16:42 +0000
|
|
|
a6e2d8 |
Subject: install/updates: move external members past schema compat update
|
|
|
a6e2d8 |
|
|
|
a6e2d8 |
|
|
|
a6e2d8 |
There is an ordering discrepancy because the base compat tree
|
|
|
a6e2d8 |
configuration is in install/updates/80-schema_compat.update so it is ran
|
|
|
a6e2d8 |
after 50-externalmembers.update. And since at that point
|
|
|
a6e2d8 |
cn=groups,cn=Schema ... does not exist yet, external members
|
|
|
a6e2d8 |
configuration is not applied.
|
|
|
a6e2d8 |
|
|
|
a6e2d8 |
Move it around to make sure it is applied after Schema Compatibility
|
|
|
a6e2d8 |
plugin configuration is created.
|
|
|
a6e2d8 |
|
|
|
a6e2d8 |
Fixes: https://pagure.io/freeipa/issue/8193
|
|
|
a6e2d8 |
Signed-off-by: Alexander Bokovoy <abokovoy@redhat.com>
|
|
|
a6e2d8 |
Reviewed-By: Florence Blanc-Renaud <flo@redhat.com>
|
|
|
a6e2d8 |
|
|
|
a6e2d8 |
---
|
|
|
a6e2d8 |
|
|
|
a6e2d8 |
diff --git a/install/updates/50-externalmembers.update b/install/updates/50-externalmembers.update
|
|
|
a6e2d8 |
deleted file mode 100644
|
|
|
a6e2d8 |
index 6b9c5dd..0000000
|
|
|
a6e2d8 |
--- a/install/updates/50-externalmembers.update
|
|
|
a6e2d8 |
+++ /dev/null
|
|
|
a6e2d8 |
@@ -1,3 +0,0 @@
|
|
|
a6e2d8 |
-dn: cn=groups,cn=Schema Compatibility,cn=plugins,cn=config
|
|
|
a6e2d8 |
-addifexist: schema-compat-entry-attribute: ipaexternalmember=%deref_r("member","ipaexternalmember")
|
|
|
a6e2d8 |
-addifexist: schema-compat-entry-attribute: objectclass=ipaexternalgroup
|
|
|
a6e2d8 |
diff --git a/install/updates/81-externalmembers.update b/install/updates/81-externalmembers.update
|
|
|
a6e2d8 |
new file mode 100644
|
|
|
a6e2d8 |
index 0000000..6b9c5dd
|
|
|
a6e2d8 |
--- /dev/null
|
|
|
a6e2d8 |
+++ b/install/updates/81-externalmembers.update
|
|
|
a6e2d8 |
@@ -0,0 +1,3 @@
|
|
|
a6e2d8 |
+dn: cn=groups,cn=Schema Compatibility,cn=plugins,cn=config
|
|
|
a6e2d8 |
+addifexist: schema-compat-entry-attribute: ipaexternalmember=%deref_r("member","ipaexternalmember")
|
|
|
a6e2d8 |
+addifexist: schema-compat-entry-attribute: objectclass=ipaexternalgroup
|
|
|
a6e2d8 |
diff --git a/install/updates/Makefile.am b/install/updates/Makefile.am
|
|
|
a6e2d8 |
index 68facba..8a4d9cc 100644
|
|
|
a6e2d8 |
--- a/install/updates/Makefile.am
|
|
|
a6e2d8 |
+++ b/install/updates/Makefile.am
|
|
|
a6e2d8 |
@@ -52,7 +52,6 @@ app_DATA = \
|
|
|
a6e2d8 |
50-krbenctypes.update \
|
|
|
a6e2d8 |
50-nis.update \
|
|
|
a6e2d8 |
50-ipaconfig.update \
|
|
|
a6e2d8 |
- 50-externalmembers.update \
|
|
|
a6e2d8 |
55-pbacmemberof.update \
|
|
|
a6e2d8 |
59-trusts-sysacount.update \
|
|
|
a6e2d8 |
60-trusts.update \
|
|
|
a6e2d8 |
@@ -65,7 +64,8 @@ app_DATA = \
|
|
|
a6e2d8 |
73-winsync.update \
|
|
|
a6e2d8 |
73-certmap.update \
|
|
|
a6e2d8 |
75-user-trust-attributes.update \
|
|
|
a6e2d8 |
- 80-schema_compat.update \
|
|
|
a6e2d8 |
+ 80-schema_compat.update \
|
|
|
a6e2d8 |
+ 81-externalmembers.update \
|
|
|
a6e2d8 |
90-post_upgrade_plugins.update \
|
|
|
a6e2d8 |
$(NULL)
|
|
|
a6e2d8 |
|
|
|
a6e2d8 |
|