summaryrefslogtreecommitdiff
path: root/source4/torture
diff options
context:
space:
mode:
authorKamen Mazdrashki <kamenim@samba.org>2010-10-09 04:22:24 +0300
committerKamen Mazdrashki <kamenim@samba.org>2010-10-09 06:01:15 +0300
commit6853883f3f171c69b28a0888548aaa464e163ac7 (patch)
tree85c2fc46a029c098822ae4471b6755f9810b0352 /source4/torture
parent9e1e581120d966f40d3c781fc92b18fc5d63c38a (diff)
downloadsamba-6853883f3f171c69b28a0888548aaa464e163ac7.tar.gz
samba-6853883f3f171c69b28a0888548aaa464e163ac7.tar.bz2
samba-6853883f3f171c69b28a0888548aaa464e163ac7.zip
s4-test-msds_intid: Simplify parameters for _make_error_message() function
so it can be used in more places - when checking for Linked Attributes ATTIDs for instance
Diffstat (limited to 'source4/torture')
-rw-r--r--source4/torture/drs/rpc/msds_intid.c28
1 files changed, 18 insertions, 10 deletions
diff --git a/source4/torture/drs/rpc/msds_intid.c b/source4/torture/drs/rpc/msds_intid.c
index ea5bdc6f28..6fded004ce 100644
--- a/source4/torture/drs/rpc/msds_intid.c
+++ b/source4/torture/drs/rpc/msds_intid.c
@@ -460,17 +460,17 @@ static bool _test_GetNCChanges(struct torture_context *tctx,
}
static char * _make_error_message(TALLOC_CTX *mem_ctx,
- const struct dsdb_attribute *dsdb_attr,
- const struct drsuapi_DsReplicaAttribute *drs_attr,
- const struct drsuapi_DsReplicaObjectListItemEx *drs_obj)
+ enum drsuapi_DsAttributeId drs_attid,
+ const struct dsdb_attribute *dsdb_attr,
+ const struct drsuapi_DsReplicaObjectIdentifier *identifier)
{
return talloc_asprintf(mem_ctx, "\nInvalid ATTID for %1$s (%2$s)\n"
" drs_attid: %3$11d (0x%3$08X)\n"
" msDS_IntId: %4$11d (0x%4$08X)\n"
" attributeId_id: %5$11d (0x%5$08X)",
dsdb_attr->lDAPDisplayName,
- drs_obj->object.identifier->dn,
- drs_attr->attid,
+ identifier->dn,
+ drs_attid,
dsdb_attr->msDS_IntId,
dsdb_attr->attributeID_id);
}
@@ -518,11 +518,15 @@ static bool test_dsintid_schema(struct torture_context *tctx, struct DsIntIdTest
torture_assert(tctx,
drs_attr->attid == dsdb_attr->attributeID_id,
- _make_error_message(ctx, dsdb_attr, drs_attr, cur))
+ _make_error_message(ctx, drs_attr->attid,
+ dsdb_attr,
+ cur->object.identifier));
if (dsdb_attr->msDS_IntId) {
torture_assert(tctx,
- drs_attr->attid != dsdb_attr->msDS_IntId,
- _make_error_message(ctx, dsdb_attr, drs_attr, cur))
+ drs_attr->attid != dsdb_attr->msDS_IntId,
+ _make_error_message(ctx, drs_attr->attid,
+ dsdb_attr,
+ cur->object.identifier));
}
}
}
@@ -576,11 +580,15 @@ static bool test_dsintid_domain(struct torture_context *tctx, struct DsIntIdTest
if (dsdb_attr->msDS_IntId) {
torture_assert(tctx,
drs_attr->attid == dsdb_attr->msDS_IntId,
- _make_error_message(ctx, dsdb_attr, drs_attr, cur))
+ _make_error_message(ctx, drs_attr->attid,
+ dsdb_attr,
+ cur->object.identifier));
} else {
torture_assert(tctx,
drs_attr->attid == dsdb_attr->attributeID_id,
- _make_error_message(ctx, dsdb_attr, drs_attr, cur))
+ _make_error_message(ctx, drs_attr->attid,
+ dsdb_attr,
+ cur->object.identifier));
}
}
}