Attachment 7694 Details for Bug 41207 – patch

[patch] patch

41207.patch (text/plain), 3.21 KB, created by Florian Best on 2016-05-27 10:20:59 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Florian Best

Created: 2016-05-27 10:20:59 CEST

Size: 3.21 KB

patch

obsolete

>diff --git a/management/univention-directory-manager-modules/modules/univention/admin/handlers/__init__.py b/management/univention-directory-manager-modules/modules/univention/admin/handlers/__init__.py
>index cd54420..6dae6f3 100644
>--- a/management/univention-directory-manager-modules/modules/univention/admin/handlers/__init__.py
>+++ b/management/univention-directory-manager-modules/modules/univention/admin/handlers/__init__.py
>@@ -826,13 +826,44 @@ def _modify(self, modify_childs=1, ignore_license=0):
> 		added_options = options - old_options - unavailable_options
> 		removed_options = old_options - options - unavailable_options
> 
>-#		ocs -= object_classes_to_remove  # FIXME: Bug #41207; check which attributes still need it
> 		ocs -= set(chain.from_iterable(m.options[option].objectClasses for option in removed_options))
> 		ocs |= set(chain.from_iterable(m.options[option].objectClasses for option in added_options))
> 		if set(self.oldattr.get('objectClass', [])) != ocs:
> 			ml = [x for x in ml if x[0].lower() != 'objectClass'.lower()]
> 			ml.append(('objectClass', self.oldattr.get('objectClass', []), list(ocs)))
> 
>+		# parse LDAP schema
>+		schema = ldap.schema.SubSchema(self.lo.lo.lo.read_subschemasubentry_s(self.lo.lo.lo.search_subschemasubentry_s()), 0)
>+		newattr = ldap.cidict.cidict(_MergedAttributes(self, ml).get_attributes())
>+		ocs_afterwards = set(newattr.get('objectClass', [])) - object_classes_to_remove
>+
>+		# make sure we still have a structural object class
>+		if not schema.get_structural_oc(ocs_afterwards):
>+			structural_ocs = schema.get_structural_oc(object_classes_to_remove)
>+			if structural_ocs:
>+				univention.debug.debug(univention.debug.ADMIN, univention.debug.WARN, 'Preventing to remove last structural object class %r' % (structural_ocs,))
>+				object_classes_to_remove -= set(schema.get_obj(ldap.schema.models.ObjectClass, structural_ocs).names)
>+				ocs_afterwards = set(newattr.get('objectClass', [])) - object_classes_to_remove
>+			else:
>+				univention.debug.debug(univention.debug.ADMIN, univention.debug.ERROR, 'missing structural object class. Modify will fail.')
>+
>+		# validate removal of object classes
>+		do_removal = True
>+		must, may = schema.attribute_types(ocs_afterwards)
>+		must = ldap.cidict.cidict(dict((x, x) for x in list(chain.from_iterable(x.names for x in must.values()))))
>+		may = ldap.cidict.cidict(dict((x, x) for x in list(chain.from_iterable(x.names for x in may.values()))))
>+		for attr in must.keys():
>+			if not newattr.get(attr):
>+				univention.debug.debug(univention.debug.ADMIN, univention.debug.INFO, 'The attribute %r is required in the current object classes.' % (attr,))
>+				do_removal = False
>+		for attr, val in newattr.items():
>+			if val and not must.get(attr) and not may.get(attr):
>+				univention.debug.debug(univention.debug.ADMIN, univention.debug.INFO, 'The attribute %r has is now known by any object class.' % (attr,))
>+				do_removal = False
>+		if do_removal:
>+			ml = [x for x in ml if x[0].lower() != 'objectClass'.lower()]
>+			ml.append(('objectClass', self.oldattr.get('objectClass', []), list(ocs - object_classes_to_remove)))
>+
> 		ml = self.call_udm_property_hook('hook_ldap_modlist', self, ml)
> 
> 		#FIXME: timeout without exception if objectClass of Object is not exsistant !!

Actions: View | Diff

Attachments on bug 41207: 7693 | 7694 | 7746