From 7a98d658d662f0cec33ba6207474d8271029b4bd Mon Sep 17 00:00:00 2001 From: root Date: Wed, 4 Mar 2015 11:11:45 +0100 Subject: [PATCH] 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 --- install/updates/10-schema_compat.update | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/install/updates/10-schema_compat.update b/install/updates/10-schema_compat.update index b8c79012d121116f9cf53908fbe4eeeebe9d3d82..4484bdcce15736eeaffcc99edc694094b16fd0ed 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 -- 2.1.0