sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-13 13:18:06 +03:00
Code

replmd: Move logic into new replmd_should_apply_isDeleted() function

Browse Source 
It's easier to follow the logic involved here when it's split out into a
separate function.

This patch should not alter the existing logic/functionality.

Note the 'else' case is somewhat redundant, but it avoids excessive
whitespace changes to the function. It'll be tidied up in the next
patch.

Signed-off-by: Tim Beale <timbeale@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Tim Beale 2018-11-20 15:54:31 +13:00 committed by Andrew Bartlett
parent b9c5417b52
commit 9d5af87e66
1 changed files with 45 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6798,6 +6798,45 @@ static int replmd_replicated_apply_next(struct replmd_replicated_request *ar)
return ldb_next_request(ar->module, search_req);
}
/*
* Returns true if we need to do extra processing to handle deleted object
* changes received via replication
*/
static bool replmd_should_apply_isDeleted(struct replmd_replicated_request *ar,
struct ldb_message *msg)
{
struct ldb_dn *deleted_objects_dn;
int ret;
if (!ar->isDeleted) {
/* not a deleted object, so don't set isDeleted */
return false;
}
ret = dsdb_get_deleted_objects_dn(ldb_module_get_ctx(ar->module),
msg, msg->dn,
&deleted_objects_dn);
/*
* if the Deleted Object container lookup failed, then just apply
* isDeleted (note that it doesn't exist for the Schema partition)
*/
if (ret != LDB_SUCCESS) {
return true;
}
/*
* the Deleted Objects container has isDeleted set but is not entirely
* a deleted object, so DON'T re-apply isDeleted to it
*/
if (ldb_dn_compare(msg->dn, deleted_objects_dn) == 0) {
return false;
}
return true;
}
/*
* This is essentially a wrapper for replmd_replicated_apply_next()
*
@ -6805,20 +6844,19 @@ static int replmd_replicated_apply_next(struct replmd_replicated_request *ar)
*/
static int replmd_replicated_apply_isDeleted(struct replmd_replicated_request *ar)
{
struct ldb_dn *deleted_objects_dn;
struct ldb_message *msg = ar->objs->objects[ar->index_current].msg;
int ret;
bool apply_isDeleted;
if (!ar->isDeleted) {
apply_isDeleted = replmd_should_apply_isDeleted(ar, msg);
/* not a deleted object, so nothing to do */
if (!apply_isDeleted) {
/* nothing to do */
ar->index_current++;
return replmd_replicated_apply_next(ar);
}
ret = dsdb_get_deleted_objects_dn(ldb_module_get_ctx(ar->module), msg,
msg->dn, &deleted_objects_dn);
if (ret != LDB_SUCCESS || ldb_dn_compare(msg->dn, deleted_objects_dn) != 0) {
} else {
/*
* Do a delete here again, so that if there is
* anything local that conflicts with this