From 985e86b04d4035c133a29a6a681523b9ca247a19 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Mon, 13 Dec 2004 11:34:57 +0000 Subject: r4176: I just remeber that I have already implement STR_CONFORMANT so use it in DsReplicaSync() metze (This used to be commit ca610da1fc3c059d35e17238e8cac5e5b38790c3) --- source4/librpc/idl/drsuapi.idl | 3 +-- source4/torture/rpc/drsuapi.c | 8 ++------ 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/source4/librpc/idl/drsuapi.idl b/source4/librpc/idl/drsuapi.idl index a3f6cf2100..c5f7f9f8d7 100644 --- a/source4/librpc/idl/drsuapi.idl +++ b/source4/librpc/idl/drsuapi.idl @@ -55,8 +55,7 @@ interface drsuapi uint32 unknown2; GUID guid1; uint8 unknown3[28]; - [range(0,0xA00000)] uint32 length; - [size_is(length+1)] uint16 nc_dn[*]; + [flag(STR_SIZE4|STR_CHARLEN|STR_CONFORMANT)] string nc_dn; } drsuapi_DsReplicaSyncRequest1Info; typedef struct { diff --git a/source4/torture/rpc/drsuapi.c b/source4/torture/rpc/drsuapi.c index 0b1377c740..7bef1e5360 100644 --- a/source4/torture/rpc/drsuapi.c +++ b/source4/torture/rpc/drsuapi.c @@ -780,22 +780,18 @@ static BOOL test_DsReplicaSync(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, r.in.level = array[i].level; switch(r.in.level) { - case 1: { - uint16_t string[] = { 0x0064, 0x0063, 0x003d, 0x0073, 0x0039, 0x0000}; - ZERO_STRUCT(r.in.req.req1); + case 1: r.in.req.req1.info = &info1; r.in.req.req1.info->unknown1 = 32; r.in.req.req1.info->unknown2 = 120; ZERO_STRUCT(r.in.req.req1.info->guid1); ZERO_ARRAY(r.in.req.req1.info->unknown3); - r.in.req.req1.info->length = ARRAY_SIZE(string)-1; - r.in.req.req1.info->nc_dn = string;/*priv->domain_obj_dn*/; + r.in.req.req1.info->nc_dn = priv->domain_obj_dn; r.in.req.req1.guid1 = priv->dcinfo.ntds_guid; r.in.req.req1.string1 = NULL; r.in.req.req1.unknown1 = 16; break; } - } status = dcerpc_drsuapi_DsReplicaSync(p, mem_ctx, &r); if (!NT_STATUS_IS_OK(status)) { -- cgit