diff options
| author | root <root@vm-035.idm.lab.eng.brq.redhat.com> | 2015-03-04 11:11:45 +0100 |
|---|---|---|
| committer | Jan Cholasta <jcholast@redhat.com> | 2015-03-05 13:34:25 +0000 |
| commit | 6e00f7318230781debd9952c6f2a3d924f35688a (patch) | |
| tree | 29c7330d88b19498a7718ebad1b1e52cab0f69cc /install/updates | |
| parent | 4a20115ce8a3d90afec827d356edecc7834a0684 (diff) | |
| download | freeipa-6e00f7318230781debd9952c6f2a3d924f35688a.tar.gz freeipa-6e00f7318230781debd9952c6f2a3d924f35688a.tar.xz freeipa-6e00f7318230781debd9952c6f2a3d924f35688a.zip | |
Limit deadlocks between DS plugin DNA and slapi-nis
Deadlock can occur if DNA plugin (shared) config and Schema-compat plugin config
are updated at the same time.
Schema-compat should ignore update on DNA config.
https://fedorahosted.org/freeipa/ticket/4927
Reviewed-By: Jan Cholasta <jcholast@redhat.com>
Diffstat (limited to 'install/updates')
| -rw-r--r-- | install/updates/10-schema_compat.update | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/install/updates/10-schema_compat.update b/install/updates/10-schema_compat.update index b8c79012d..4484bdcce 100644 --- a/install/updates/10-schema_compat.update +++ b/install/updates/10-schema_compat.update @@ -22,6 +22,7 @@ remove: schema-compat-ignore-subtree: cn=changelog remove: schema-compat-ignore-subtree: o=ipaca add: schema-compat-restrict-subtree: '$SUFFIX' add: schema-compat-restrict-subtree: 'cn=Schema Compatibility,cn=plugins,cn=config' +add: schema-compat-ignore-subtree: 'cn=dna,cn=ipa,cn=etc,$SUFFIX' # Change padding for host and userCategory so the pad returns the same value # as the original, '' or -. @@ -31,6 +32,7 @@ remove: schema-compat-ignore-subtree: cn=changelog remove: schema-compat-ignore-subtree: o=ipaca add: schema-compat-restrict-subtree: '$SUFFIX' add: schema-compat-restrict-subtree: 'cn=Schema Compatibility,cn=plugins,cn=config' +add: schema-compat-ignore-subtree: 'cn=dna,cn=ipa,cn=etc,$SUFFIX' dn: cn=computers, cn=Schema Compatibility, cn=plugins, cn=config default:objectClass: top @@ -49,6 +51,7 @@ remove: schema-compat-ignore-subtree: cn=changelog remove: schema-compat-ignore-subtree: o=ipaca add: schema-compat-restrict-subtree: '$SUFFIX' add: schema-compat-restrict-subtree: 'cn=Schema Compatibility,cn=plugins,cn=config' +add: schema-compat-ignore-subtree: 'cn=dna,cn=ipa,cn=etc,$SUFFIX' dn: cn=sudoers,cn=Schema Compatibility,cn=plugins,cn=config add:schema-compat-entry-attribute: sudoOrder=%{sudoOrder} @@ -58,12 +61,14 @@ remove: schema-compat-ignore-subtree: cn=changelog remove: schema-compat-ignore-subtree: o=ipaca add: schema-compat-restrict-subtree: '$SUFFIX' add: schema-compat-restrict-subtree: 'cn=Schema Compatibility,cn=plugins,cn=config' +add: schema-compat-ignore-subtree: 'cn=dna,cn=ipa,cn=etc,$SUFFIX' dn: cn=groups,cn=Schema Compatibility,cn=plugins,cn=config remove: schema-compat-ignore-subtree: cn=changelog remove: schema-compat-ignore-subtree: o=ipaca add: schema-compat-restrict-subtree: '$SUFFIX' add: schema-compat-restrict-subtree: 'cn=Schema Compatibility,cn=plugins,cn=config' +add: schema-compat-ignore-subtree: 'cn=dna,cn=ipa,cn=etc,$SUFFIX' dn: cn=Schema Compatibility,cn=plugins,cn=config # We need to run schema-compat pre-bind callback before |