summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRob Crittenden <rcritten@redhat.com>2011-09-12 10:36:56 -0400
committerMartin Kosek <mkosek@redhat.com>2011-09-13 17:36:59 +0200
commit5371c03c93ddc73ebafc4107e7340ac911e27ed5 (patch)
tree08c0576aaa92285de31fa356f43b50265eb31718
parent4fd20966f69014d4dc3747ce6b7940adfa669b13 (diff)
downloadfreeipa-5371c03c93ddc73ebafc4107e7340ac911e27ed5.tar.gz
freeipa-5371c03c93ddc73ebafc4107e7340ac911e27ed5.tar.xz
freeipa-5371c03c93ddc73ebafc4107e7340ac911e27ed5.zip
The precendence on the modrdn plugin was set in the wrong location.
https://fedorahosted.org/freeipa/ticket/1370
-rw-r--r--daemons/ipa-slapi-plugins/ipa-modrdn/modrdn-conf.ldif1
-rw-r--r--install/share/modrdn-krbprinc.ldif1
-rw-r--r--install/updates/10-config.update6
3 files changed, 6 insertions, 2 deletions
diff --git a/daemons/ipa-slapi-plugins/ipa-modrdn/modrdn-conf.ldif b/daemons/ipa-slapi-plugins/ipa-modrdn/modrdn-conf.ldif
index 54916eb74..176f8becf 100644
--- a/daemons/ipa-slapi-plugins/ipa-modrdn/modrdn-conf.ldif
+++ b/daemons/ipa-slapi-plugins/ipa-modrdn/modrdn-conf.ldif
@@ -13,3 +13,4 @@ nsslapd-pluginversion: 1.0
nsslapd-pluginvendor: Red Hat, Inc.
nsslapd-plugindescription: IPA MODRDN plugin
nsslapd-plugin-depends-on-type: database
+nsslapd-pluginPrecedence: 60
diff --git a/install/share/modrdn-krbprinc.ldif b/install/share/modrdn-krbprinc.ldif
index 15e6d3c95..b35ea25f4 100644
--- a/install/share/modrdn-krbprinc.ldif
+++ b/install/share/modrdn-krbprinc.ldif
@@ -9,4 +9,3 @@ ipaModRDNtargetAttr: krbPrincipalName
ipaModRDNsuffix: @$REALM
ipaModRDNfilter: (&(objectclass=posixaccount)(objectclass=krbPrincipalAux))
ipaModRDNscope: $SUFFIX
-nsslapd-pluginPrecedence: 60
diff --git a/install/updates/10-config.update b/install/updates/10-config.update
index b3beefc8b..133ec6766 100644
--- a/install/updates/10-config.update
+++ b/install/updates/10-config.update
@@ -4,7 +4,11 @@
dn: cn=config
only:nsslapd-ssl-check-hostname: on
+# Remove incorrect placement
+dn: cn=Kerberos Principal Name,cn=IPA MODRDN,cn=plugins,cn=config
+remove: nsslapd-pluginPrecedence: 60
+
# Set the precedence of the ipa-modrdn plugin so it runs after other
# plugins (the default is 50).
-dn: cn=Kerberos Principal Name,cn=IPA MODRDN,cn=plugins,cn=config
+dn: cn=IPA MODRDN,cn=plugins,cn=config
only: nsslapd-pluginPrecedence: 60