|
2422 |
ud.debug(ud.LDAP, ud.ALL, "sync_from_ucs: addlist: %s" % addlist) |
2422 |
ud.debug(ud.LDAP, ud.ALL, "sync_from_ucs: addlist: %s" % addlist) |
2423 |
try: |
2423 |
try: |
2424 |
self.lo_s4.lo.add_ext_s(compatible_modstring(object['dn']), compatible_addlist(addlist), serverctrls=ctrls) #FIXME encoding |
2424 |
self.lo_s4.lo.add_ext_s(compatible_modstring(object['dn']), compatible_addlist(addlist), serverctrls=ctrls) #FIXME encoding |
|
|
2425 |
except ldap.ALREADY_EXISTS as ex: |
2426 |
sAMAccountName_attr_value = object['attributes'].get('sAMAccountName')[0] |
2427 |
objectSid_attr_value = object['attributes'].get('objectSid')[0] |
2428 |
objectSid = decode_sid(objectSid_attr_value) |
2429 |
if not (sAMAccountName_attr_value and objectSid): |
2430 |
raise ## unknown situation |
2431 |
filter_s4 = '(&(sAMAccountName=%s)(objectSid=%s)(isDeleted=TRUE))' % (sAMAccountName_attr_value, objectSid) |
2432 |
ud.debug(ud.LDAP, ud.WARN, "sync_from_ucs: Error during add, searching for conflicting deleted object in S4. Filter: %s" % filter_s4) |
2433 |
result = self.lo_s4.lo.search_ext_s(self.lo_s4.base, ldap.SCOPE_SUBTREE, filter_s4, ['objectClass', 'objectCategory', 'isDeleted', 'isRecycled', 'lastKnownParent'], serverctrls=[self.ctrl_show_deleted, LDAPControl(LDB_CONTROL_DOMAIN_SCOPE_OID, criticality=0)]) |
2434 |
if not result or len(result)>1: ## the latter would indicate corruption |
2435 |
ud.debug(ud.LDAP, ud.WARN,"sync_from_ucs: No conflicting object found.") |
2436 |
raise ## unknown situation |
2437 |
(deleted_object_dn, deleted_object) = result[0] |
2438 |
ud.debug(ud.LDAP, ud.WARN, "sync_from_ucs: Reanimating deleted object in S4: %s" % deleted_object_dn) |
2439 |
## Currently tombstone_reanimate.c and tests/python/tombstone_reanimation.py |
2440 |
## which implement https://msdn.microsoft.com/en-us/library/cc223467.aspx (MS-ADTS 3.1.1.5.3.7) |
2441 |
## are disabled in Samba. Workaround: |
2442 |
idx = deleted_object_dn.find('\x0ADEL:') |
2443 |
reanimate_modlist = [(ldap.MOD_DELETE, 'isDeleted', 'TRUE')] |
2444 |
reanimate_modlist.append((ldap.MOD_DELETE, 'lastKnownParent', deleted_object['lastKnownParent'][0])) |
2445 |
reanimate_modlist.append((ldap.MOD_DELETE, 'isRecycled', 'TRUE')) |
2446 |
if not deleted_object.get('objectCategory'): |
2447 |
top_most_structural_objectclass = deleted_object['objectClass'][-1] |
2448 |
result = self.lo_s4.lo.search_ext_s("CN=Schema,CN=Configuration,%s" % self.lo_s4.base, ldap.SCOPE_SUBTREE, 'lDAPDisplayName=%s' % top_most_structural_objectclass, ['defaultObjectCategory']) |
2449 |
reanimate_modlist.append((ldap.MOD_ADD, 'objectCategory', result[0][1]['defaultObjectCategory'][0])) |
2450 |
self.lo_s4.lo.modify_ext_s(compatible_modstring(deleted_object_dn), compatible_modlist(reanimate_modlist), serverctrls=[self.ctrl_show_deleted,]) |
2451 |
self.lo_s4.lo.rename_s(compatible_modstring(deleted_object_dn), deleted_object_dn[:idx], newsuperior=deleted_object['lastKnownParent'], delold=1) |
2452 |
## and retry |
2453 |
return self.sync_from_ucs(property_type, object, pre_mapped_ucs_dn, old_dn, old_ucs_object, new_ucs_object) |
2425 |
except: |
2454 |
except: |
2426 |
ud.debug(ud.LDAP, ud.ERROR, "sync_from_ucs: traceback during add object: %s" % object['dn']) |
2455 |
ud.debug(ud.LDAP, ud.ERROR, "sync_from_ucs: traceback during add object: %s" % object['dn']) |
2427 |
ud.debug(ud.LDAP, ud.ERROR, "sync_from_ucs: traceback due to addlist: %s" % addlist) |
2456 |
ud.debug(ud.LDAP, ud.ERROR, "sync_from_ucs: traceback due to addlist: %s" % addlist) |