sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

objectclass_attrs: Only abort on a missing attribute when an attribute is both MUST and replicated

Browse Source 
If an attribute is not replicated or constructed, it is quite normal for
it to be missing. This is the case with both rIDNextRid and
rIDPreviousAllocationPool. This currently prevents us switching the RID
master. On Windows, missing this attribute does not cause any problems
for the RID manager.

We may now remove the knownfail entry added earlier.

Signed-off-by: Clive Ferreira <cliveferreira@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

Pair-programmed-with: Garming Sam <garming@catalyst.net.nz>
Pair-programmed-with: Bob Campbell <bobcampbell@catalyst.net.nz>

BUG: https://bugzilla.samba.org/show_bug.cgi?id=12394

Autobuild-User(master): Garming Sam <garming@samba.org>
Autobuild-Date(master): Wed Nov  2 01:28:44 CET 2016 on sn-devel-144
This commit is contained in:
Clive Ferreira 2016-10-11 15:32:54 +13:00 committed by Garming Sam
parent e0aa056095
commit 79dd22aacb
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
selftest/knownfail
View File

@ -306,4 +306,3 @@
^samba4.rpc.echo.*on.*with.object.echo.sinkdata.*nt4_dc
^samba4.rpc.echo.*on.*with.object.echo.addone.*nt4_dc
^samba4.rpc.echo.*on.*ncacn_ip_tcp.*with.object.*nt4_dc
^samba4.drs.getnc_exop.python.*getnc_exop.DrsReplicaSyncTestCase.test_edit_rid_master.*

23
source4/dsdb/samdb/ldb_modules/objectclass_attrs.c
View File

@ -426,12 +426,23 @@ static int attr_handler2(struct oc_context *ac)
* replicated.
*/
if (found_must_contain[0] != NULL &&
ldb_msg_check_string_attribute(msg, "isDeleted", "TRUE") == 0 &&
ldb_request_get_control(ac->req, DSDB_CONTROL_DBCHECK) == NULL) {
ldb_asprintf_errstring(ldb, "objectclass_attrs: at least one mandatory attribute ('%s') on entry '%s' wasn't specified!",
found_must_contain[0],
ldb_dn_get_linearized(msg->dn));
return LDB_ERR_OBJECT_CLASS_VIOLATION;
ldb_msg_check_string_attribute(msg, "isDeleted", "TRUE") == 0) {
for (i = 0; found_must_contain[i] != NULL; i++) {
const struct dsdb_attribute *broken_attr = dsdb_attribute_by_lDAPDisplayName(ac->schema,
found_must_contain[i]);
bool replicated = (broken_attr->systemFlags &
(DS_FLAG_ATTR_NOT_REPLICATED | DS_FLAG_ATTR_IS_CONSTRUCTED)) == 0;
if (replicated) {
ldb_asprintf_errstring(ldb, "objectclass_attrs: at least one mandatory "
"attribute ('%s') on entry '%s' wasn't specified!",
found_must_contain[i],
ldb_dn_get_linearized(msg->dn));
return LDB_ERR_OBJECT_CLASS_VIOLATION;
}
}
}
if (isSchemaAttr) {