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