View | Details | Raw Unified | Return to bug 49324
Collapse All | Expand All

(-)a/services/univention-s4-connector/modules/univention/s4connector/__init__.py (-2 / +5 lines)
 Lines 1434-1442   class ucs: Link Here 
1434
							key = k
1434
							key = k
1435
							break
1435
							break
1436
					back_mapped_subobject = self._object_mapping(key, subobject_ucs, 'ucs')
1436
					back_mapped_subobject = self._object_mapping(key, subobject_ucs, 'ucs')
1437
					result_s4 = self.lo_s4.lo.search_ext_s(univention.s4connector.s4.compatible_modstring(back_mapped_subobject['dn']), ldap.SCOPE_BASE, '(objectClass=*)', timeout=-1, sizelimit=0)
1438
					subobject_s4 = {'dn': result_s4[0][0], 'modtype': 'delete', 'attributes': result_s4[0][1]}
1437
					ud.debug(ud.LDAP, ud.WARN, "delete subobject: %s" % back_mapped_subobject['dn'])
1439
					ud.debug(ud.LDAP, ud.WARN, "delete subobject: %s" % back_mapped_subobject['dn'])
1438
					if not self._ignore_object(key, back_mapped_subobject):
1440
					if not self._ignore_object(key, back_mapped_subobject):
1439
						if not self.sync_to_ucs(key, subobject_ucs, back_mapped_subobject['dn'], object):
1441
						if not self.sync_to_ucs(key, subobject_ucs, back_mapped_subobject['dn'], subobject_s4):
1440
							try:
1442
							try:
1441
								ud.debug(ud.LDAP, ud.WARN, "delete of subobject failed: %s" % result[0])
1443
								ud.debug(ud.LDAP, ud.WARN, "delete of subobject failed: %s" % result[0])
1442
							except (ldap.SERVER_DOWN, SystemExit):
1444
							except (ldap.SERVER_DOWN, SystemExit):
 Lines 1508-1514   class ucs: Link Here 
1508
					return False
1510
					return False
1509
1511
1510
		try:
1512
		try:
1511
			guid_unicode = original_object.get('attributes').get('objectGUID')[0]
1513
			attributes = original_object.get('attributes')
1514
			guid_unicode = attributes.get('objectGUID')[0]
1512
			guid_blob = guid_unicode.encode('ISO-8859-1')  # to compensate for __object_from_element
1515
			guid_blob = guid_unicode.encode('ISO-8859-1')  # to compensate for __object_from_element
1513
			guid = str(ndr_unpack(misc.GUID, guid_blob))
1516
			guid = str(ndr_unpack(misc.GUID, guid_blob))
1514
1517

Return to bug 49324