sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-12 20:58:37 +03:00
Code

s4-dsdb: added comments and fixed backlink check in repl_meta_data

Browse Source 
added comments explaining the backlink deletion code, plus fix a use
of a bitwise operation in a boolean expression, and avoid calling
dsdb_functional_level() inside a loop

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Andrew Tridgell 2011-08-15 16:01:39 +10:00
parent 16fa0f68bd
commit c5dc26b976
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
source4/dsdb/samdb/ldb_modules/repl_meta_data.c
View File

@ -2724,6 +2724,7 @@ static int replmd_delete(struct ldb_module *module, struct ldb_request *req)
OBJECT_TOMBSTONE=4, OBJECT_REMOVED=5 }; OBJECT_TOMBSTONE=4, OBJECT_REMOVED=5 };
enum deletion_state deletion_state, next_deletion_state; enum deletion_state deletion_state, next_deletion_state;
bool enabled; bool enabled;
int functional_level;
if (ldb_dn_is_special(req->op.del.dn)) { if (ldb_dn_is_special(req->op.del.dn)) {
return ldb_next_request(module, req); return ldb_next_request(module, req);
@ -2740,6 +2741,8 @@ static int replmd_delete(struct ldb_module *module, struct ldb_request *req)
return LDB_ERR_OPERATIONS_ERROR; return LDB_ERR_OPERATIONS_ERROR;
} }
functional_level = dsdb_functional_level(ldb);
old_dn = ldb_dn_copy(tmp_ctx, req->op.del.dn); old_dn = ldb_dn_copy(tmp_ctx, req->op.del.dn);
/* we need the complete msg off disk, so we can work out which /* we need the complete msg off disk, so we can work out which
@ -2940,7 +2943,7 @@ static int replmd_delete(struct ldb_module *module, struct ldb_request *req)
/* we also mark it as recycled, meaning this object can't be /* we also mark it as recycled, meaning this object can't be
recovered (we are stripping its attributes) */ recovered (we are stripping its attributes) */
if (dsdb_functional_level(ldb) >= DS_DOMAIN_FUNCTION_2008_R2) { if (functional_level >= DS_DOMAIN_FUNCTION_2008_R2) {
ret = ldb_msg_add_string(msg, "isRecycled", "TRUE"); ret = ldb_msg_add_string(msg, "isRecycled", "TRUE");
if (ret != LDB_SUCCESS) { if (ret != LDB_SUCCESS) {
DEBUG(0,(__location__ ": Failed to add isRecycled string to the msg\n")); DEBUG(0,(__location__ ": Failed to add isRecycled string to the msg\n"));
@ -2964,12 +2967,24 @@ static int replmd_delete(struct ldb_module *module, struct ldb_request *req)
/* don't remove the rDN */ /* don't remove the rDN */
continue; continue;
} }
if (sa->linkID && sa->linkID & 1) { if (sa->linkID && (sa->linkID & 1)) {
/*
we have a backlink in this object
that needs to be removed. We're not
allowed to remove it directly
however, so we instead setup a
modify to delete the corresponding
forward link
*/
ret = replmd_delete_remove_link(module, schema, old_dn, el, sa, req); ret = replmd_delete_remove_link(module, schema, old_dn, el, sa, req);
if (ret != LDB_SUCCESS) { if (ret != LDB_SUCCESS) {
talloc_free(tmp_ctx); talloc_free(tmp_ctx);
return LDB_ERR_OPERATIONS_ERROR; return LDB_ERR_OPERATIONS_ERROR;
} }
/* now we continue, which means we
won't remove this backlink
directly
*/
continue; continue;
} }
if (!sa->linkID && ldb_attr_in_list(preserved_attrs, el->name)) { if (!sa->linkID && ldb_attr_in_list(preserved_attrs, el->name)) {