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>
This commit is contained in:
root 2015-03-04 11:11:45 +01:00 committed by Jan Cholasta
parent 253f9adae7
commit 5c3611481a

View File

@ -22,6 +22,7 @@ remove: schema-compat-ignore-subtree: cn=changelog
remove: schema-compat-ignore-subtree: o=ipaca remove: schema-compat-ignore-subtree: o=ipaca
add: schema-compat-restrict-subtree: '$SUFFIX' add: schema-compat-restrict-subtree: '$SUFFIX'
add: schema-compat-restrict-subtree: 'cn=Schema Compatibility,cn=plugins,cn=config' 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 # Change padding for host and userCategory so the pad returns the same value
# as the original, '' or -. # as the original, '' or -.
@ -31,6 +32,7 @@ remove: schema-compat-ignore-subtree: cn=changelog
remove: schema-compat-ignore-subtree: o=ipaca remove: schema-compat-ignore-subtree: o=ipaca
add: schema-compat-restrict-subtree: '$SUFFIX' add: schema-compat-restrict-subtree: '$SUFFIX'
add: schema-compat-restrict-subtree: 'cn=Schema Compatibility,cn=plugins,cn=config' 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 dn: cn=computers, cn=Schema Compatibility, cn=plugins, cn=config
default:objectClass: top default:objectClass: top
@ -49,6 +51,7 @@ remove: schema-compat-ignore-subtree: cn=changelog
remove: schema-compat-ignore-subtree: o=ipaca remove: schema-compat-ignore-subtree: o=ipaca
add: schema-compat-restrict-subtree: '$SUFFIX' add: schema-compat-restrict-subtree: '$SUFFIX'
add: schema-compat-restrict-subtree: 'cn=Schema Compatibility,cn=plugins,cn=config' 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 dn: cn=sudoers,cn=Schema Compatibility,cn=plugins,cn=config
add:schema-compat-entry-attribute: sudoOrder=%{sudoOrder} 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 remove: schema-compat-ignore-subtree: o=ipaca
add: schema-compat-restrict-subtree: '$SUFFIX' add: schema-compat-restrict-subtree: '$SUFFIX'
add: schema-compat-restrict-subtree: 'cn=Schema Compatibility,cn=plugins,cn=config' 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 dn: cn=groups,cn=Schema Compatibility,cn=plugins,cn=config
remove: schema-compat-ignore-subtree: cn=changelog remove: schema-compat-ignore-subtree: cn=changelog
remove: schema-compat-ignore-subtree: o=ipaca remove: schema-compat-ignore-subtree: o=ipaca
add: schema-compat-restrict-subtree: '$SUFFIX' add: schema-compat-restrict-subtree: '$SUFFIX'
add: schema-compat-restrict-subtree: 'cn=Schema Compatibility,cn=plugins,cn=config' 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 dn: cn=Schema Compatibility,cn=plugins,cn=config
# We need to run schema-compat pre-bind callback before # We need to run schema-compat pre-bind callback before