sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-03 13:47:25 +03:00
Code

s4/dsdb/replmd: use incoming_dn_should_be_renamed() 2/2

Browse Source 
In replmd_replicated_handle_rename().

The helper function was introduced two commits ago and consists of
a large common stretch of this and the function modified in the previous
commit.

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Wed Jul 24 11:21:50 UTC 2019 on sn-devel-184
This commit is contained in:
Douglas Bagnall 2019-07-24 15:43:46 +12:00 committed by Andrew Bartlett
parent b9dab848de
commit e77237bb46
1 changed files with 3 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5885,12 +5885,7 @@ static int replmd_replicated_handle_rename(struct replmd_replicated_request *ar,
TALLOC_CTX *tmp_ctx = talloc_new(msg);
struct ldb_result *res;
struct ldb_dn *conflict_dn;
const char *attrs[] = { "replPropertyMetaData", "objectGUID", NULL };
const struct ldb_val *omd_value;
struct replPropertyMetaDataBlob omd, *rmd;
enum ndr_err_code ndr_err;
bool rename_incoming_record, rodc;
struct replPropertyMetaData1 *rmd_name, *omd_name;
bool rename_incoming_record;
struct ldb_dn *new_dn;
struct GUID guid;
@ -5916,94 +5911,15 @@ static int replmd_replicated_handle_rename(struct replmd_replicated_request *ar,
return ret;
}
ret = samdb_rodc(ldb_module_get_ctx(ar->module), &rodc);
if (ret != LDB_SUCCESS) {
ldb_asprintf_errstring(ldb_module_get_ctx(ar->module),
"Failed to determine if we are an RODC when attempting to form conflict DN: %s",
ldb_errstring(ldb_module_get_ctx(ar->module)));
return LDB_ERR_OPERATIONS_ERROR;
}
/*
* we have a conflict, and need to decide if we will keep the
* new record or the old record
*/
conflict_dn = msg->dn;
if (rodc) {
/*
* We are on an RODC, or were a GC for this
* partition, so we have to fail this until
* someone who owns the partition sorts it
* out
*/
ldb_asprintf_errstring(ldb_module_get_ctx(ar->module),
"Conflict adding object '%s' from incoming replication but we are read only for the partition. \n"
" - We must fail the operation until a master for this partition resolves the conflict",
ldb_dn_get_linearized(conflict_dn));
ret = LDB_ERR_OPERATIONS_ERROR;
goto failed;
}
/*
* first we need the replPropertyMetaData attribute from the
* old record
*/
ret = dsdb_module_search_dn(ar->module, tmp_ctx, &res, conflict_dn,
attrs,
DSDB_FLAG_NEXT_MODULE |
DSDB_SEARCH_SHOW_DELETED |
DSDB_SEARCH_SHOW_RECYCLED, ar->req);
ret = incoming_dn_should_be_renamed(tmp_ctx, ar, conflict_dn, &res,
&rename_incoming_record);
if (ret != LDB_SUCCESS) {
DEBUG(0,(__location__ ": Unable to find object for conflicting record '%s'\n",
ldb_dn_get_linearized(conflict_dn)));
goto failed;
}
omd_value = ldb_msg_find_ldb_val(res->msgs[0], "replPropertyMetaData");
if (omd_value == NULL) {
DEBUG(0,(__location__ ": Unable to find replPropertyMetaData for conflicting record '%s'\n",
ldb_dn_get_linearized(conflict_dn)));
goto failed;
}
ndr_err = ndr_pull_struct_blob(omd_value, res->msgs[0], &omd,
(ndr_pull_flags_fn_t)ndr_pull_replPropertyMetaDataBlob);
if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
DEBUG(0,(__location__ ": Failed to parse old replPropertyMetaData for %s\n",
ldb_dn_get_linearized(conflict_dn)));
goto failed;
}
rmd = ar->objs->objects[ar->index_current].meta_data;
/*
* we decide which is newer based on the RPMD on the name
* attribute. See [MS-DRSR] ResolveNameConflict.
*
* We expect omd_name to be present, as this is from a local
* search, but while rmd_name should have been given to us by
* the remote server, if it is missing we just prefer the
* local name in
* replmd_replPropertyMetaData1_new_should_be_taken()
*/
rmd_name = replmd_replPropertyMetaData1_find_attid(rmd, DRSUAPI_ATTID_name);
omd_name = replmd_replPropertyMetaData1_find_attid(&omd, DRSUAPI_ATTID_name);
if (!omd_name) {
DEBUG(0,(__location__ ": Failed to find name attribute in local LDB replPropertyMetaData for %s\n",
ldb_dn_get_linearized(conflict_dn)));
goto failed;
}
/*
* Should we preserve the current record, and so rename the
* incoming record to be a conflict?
*/
rename_incoming_record =
!replmd_replPropertyMetaData1_new_should_be_taken(
ar->objs->dsdb_repl_flags & DSDB_REPL_FLAG_PRIORITISE_INCOMING,
omd_name, rmd_name);
if (rename_incoming_record) {
new_dn = replmd_conflict_dn(msg,