r4176: I just remeber that I have already implement STR_CONFORMANT
authorStefan Metzmacher <metze@samba.org>
Mon, 13 Dec 2004 11:34:57 +0000 (11:34 +0000)
committerGerald (Jerry) Carter <jerry@samba.org>
Wed, 10 Oct 2007 18:07:23 +0000 (13:07 -0500)
so use it in DsReplicaSync()

metze
(This used to be commit ca610da1fc3c059d35e17238e8cac5e5b38790c3)

source4/librpc/idl/drsuapi.idl
source4/torture/rpc/drsuapi.c

index a3f6cf2100f7ef7f02ae35bdaa2e08662bd70fbc..c5f7f9f8d7fc1f9e1109c9b3eca619c85c9a637c 100644 (file)
@@ -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 {
index 0b1377c7401f58dc7bdb62f50f9c6f8ce5e0bc74..7bef1e53609d2d66cfdfd7201df13a9f4b9ecc2f 100644 (file)
@@ -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)) {