View | Details | Raw Unified | Return to bug 32263 | Differences between
and this patch

Collapse All | Expand All

(-)modules/univention/s4connector/__init__.py (-3 / +4 lines)
 Lines 1224-1230    Link Here 
1224
		if not objectGUID:
1224
		if not objectGUID:
1225
			objectGUID='objectGUID'
1225
			objectGUID='objectGUID'
1226
		ud.debug(ud.LDAP, ud.INFO, "update_deleted_cache_after_removal: Save entryUUID %s as deleted to UCS deleted cache. ObjectGUUID: %s" % (entryUUID, base64.encodestring(objectGUID)))
1226
		ud.debug(ud.LDAP, ud.INFO, "update_deleted_cache_after_removal: Save entryUUID %s as deleted to UCS deleted cache. ObjectGUUID: %s" % (entryUUID, base64.encodestring(objectGUID)))
1227
		self._set_config_option('UCS deleted', entryUUID, base64.encodestring(objectGUID))
1227
		self._set_config_option('UCS deleted', entryUUID, str(ndr_unpack(misc.GUID, objectGUID)))
1228
1228
1229
	def was_entryUUID_deleted(self, entryUUID):
1229
	def was_entryUUID_deleted(self, entryUUID):
1230
		objectGUID = self.config.get('UCS deleted', entryUUID)
1230
		objectGUID = self.config.get('UCS deleted', entryUUID)
 Lines 1241-1247    Link Here 
1241
			ud.debug(ud.LDAP, ud.PROCESS, "Delete of %s was disabled in mapping" % object['dn'])
1241
			ud.debug(ud.LDAP, ud.PROCESS, "Delete of %s was disabled in mapping" % object['dn'])
1242
			return True
1242
			return True
1243
1243
1244
		objectGUID = object['attributes'].get('objectGUID')[0]
1244
		guid_unicode = object['attributes'].get('objectGUID')[0]
1245
		objectGUID = guid_unicode.encode('ISO-8859-1')	## to compensate for __object_from_element
1245
		entryUUID = self._get_entryUUID(object['dn'])
1246
		entryUUID = self._get_entryUUID(object['dn'])
1246
1247
1247
		module = self.modules[property_type]
1248
		module = self.modules[property_type]
 Lines 1250-1256    Link Here 
1250
		try:
1251
		try:
1251
			ucs_object.open()
1252
			ucs_object.open()
1252
			ucs_object.remove()
1253
			ucs_object.remove()
1253
			self. update_deleted_cache_after_removal(entryUUID, objectGUID)
1254
			self.update_deleted_cache_after_removal(entryUUID, objectGUID)
1254
			return True
1255
			return True
1255
		except Exception, e:
1256
		except Exception, e:
1256
			ud.debug(ud.LDAP, ud.INFO,"delete object exception: %s"%e)
1257
			ud.debug(ud.LDAP, ud.INFO,"delete object exception: %s"%e)

Return to bug 32263