sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-29 11:21:54 +03:00
Code

replmd: replmd_check_upgrade_links() only checks the first DN

Browse Source 
This assumes the links (on an object in the database) are either all in
the old format or all in the new.

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Douglas Bagnall 2016-12-29 15:08:00 +13:00 committed by Douglas Bagnall
parent 225fa430d1
commit 5f52a8fbe7
1 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1993,7 +1993,9 @@ static int replmd_update_la_val(TALLOC_CTX *mem_ctx, struct ldb_val *v, struct d
/*
check if any links need upgrading from w2k format
The parent_ctx is the ldb_message_element which contains the values array that dns[i].v points at, and which should be used for allocating any new value.
The parent_ctx is the ldb_message_element which contains the values array
that dns[i].v points at, and which should be used for allocating any new
value.
*/
static int replmd_check_upgrade_links(struct parsed_dn *dns, uint32_t count, struct ldb_message_element *parent_ctx, const struct GUID *invocation_id)
{
@ -2003,14 +2005,29 @@ static int replmd_check_upgrade_links(struct parsed_dn *dns, uint32_t count, str
uint32_t version;
int ret;
status = dsdb_get_extended_dn_uint32(dns[i].dsdb_dn->dn, &version, "RMD_VERSION");
status = dsdb_get_extended_dn_uint32(dns[i].dsdb_dn->dn,
&version, "RMD_VERSION");
if (!NT_STATUS_EQUAL(status, NT_STATUS_OBJECT_NAME_NOT_FOUND)) {
/*
* We optimistically assume they are all the same; if
* the first one is fixed, they are all fixed.
*
* If the first one was *not* fixed and we find a
* later one that is, that is an occasion to shout
* with DEBUG(0).
*/
if (i == 0) {
return LDB_SUCCESS;
}
DEBUG(0, ("Mixed w2k and fixed format "
"linked attributes\n"));
continue;
}
/* it's an old one that needs upgrading */
ret = replmd_update_la_val(parent_ctx->values, dns[i].v, dns[i].dsdb_dn, dns[i].dsdb_dn, invocation_id,
1, 1, 0, 0, false);
ret = replmd_update_la_val(parent_ctx->values, dns[i].v,
dns[i].dsdb_dn, dns[i].dsdb_dn,
invocation_id, 1, 1, 0, 0, false);
if (ret != LDB_SUCCESS) {
return ret;
}