sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-09 08:58:35 +03:00
Code

repl_meta_data: Give more information on replication rename behaviour

Browse Source 
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
This commit is contained in:
Andrew Bartlett 2016-03-15 15:19:21 +13:00
parent 7773116f90
commit e1dcd45d9e
1 changed files with 39 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4875,15 +4875,49 @@ static int replmd_replicated_apply_search_callback(struct ldb_request *req,
if (ar->objs->dsdb_repl_flags & DSDB_REPL_FLAG_PRIORITISE_INCOMING ||
!md_remote || !md_local ||
replmd_replPropertyMetaData1_is_newer(md_local, md_remote)) {
ret = replmd_replicated_apply_search_for_parent(ar);
} else {
struct GUID_txt_buf p_guid_local;
struct GUID_txt_buf p_guid_remote;
msg = ar->objs->objects[ar->index_current].msg;
/* Otherwise, just merge on the existing object, force no rename */
DEBUG(4,(__location__ ": Keeping object %s and rejecting older rename to %s\n",
ldb_dn_get_linearized(ar->search_msg->dn),
ldb_dn_get_linearized(msg->dn)));
DEBUG(4,(__location__ ": Looking for new parent for object %s currently under %s "
"as incoming object changing to %s under %s\n",
ldb_dn_get_linearized(ar->search_msg->dn),
GUID_buf_string(&ar->local_parent_guid, &p_guid_local),
ldb_dn_get_linearized(msg->dn),
GUID_buf_string(ar->objs->objects[ar->index_current].parent_guid,
&p_guid_remote)));
ret = replmd_replicated_apply_search_for_parent(ar);
} else {
struct GUID_txt_buf p_guid_local;
struct GUID_txt_buf p_guid_remote;
msg = ar->objs->objects[ar->index_current].msg;
/* Otherwise, just merge on the existing object, force no rename */
if (strcmp(ldb_dn_get_linearized(ar->search_msg->dn),
ldb_dn_get_linearized(msg->dn)) == 0) {
if (ar->objs->objects[ar->index_current].parent_guid != NULL &&
GUID_equal(&ar->local_parent_guid,
ar->objs->objects[ar->index_current].parent_guid)
== false) {
DEBUG(4,(__location__ ": Keeping object %s at under %s "
"despite incoming object changing parent to %s\n",
ldb_dn_get_linearized(ar->search_msg->dn),
GUID_buf_string(&ar->local_parent_guid, &p_guid_local),
GUID_buf_string(ar->objs->objects[ar->index_current].parent_guid,
&p_guid_remote)));
}
} else {
DEBUG(4,(__location__ ": Keeping object %s at under %s "
" and rejecting older rename to %s under %s\n",
ldb_dn_get_linearized(ar->search_msg->dn),
GUID_buf_string(&ar->local_parent_guid, &p_guid_local),
ldb_dn_get_linearized(msg->dn),
GUID_buf_string(ar->objs->objects[ar->index_current].parent_guid,
&p_guid_remote)));
}
/*
* This assignment ensures that the strcmp()
* and GUID_equal() calls in