svn commit: samba r4176 - in branches/SAMBA_4_0/source: librpc/idl torture/rpc

[metze at samba.org]

Author: metze
Date: 2004-12-13 11:34:57 +0000 (Mon, 13 Dec 2004)
New Revision: 4176

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=4176

Log:
I just remeber that I have already implement STR_CONFORMANT

so use it in DsReplicaSync()

metze

Modified:
   branches/SAMBA_4_0/source/librpc/idl/drsuapi.idl
   branches/SAMBA_4_0/source/torture/rpc/drsuapi.c


Changeset:
Modified: branches/SAMBA_4_0/source/librpc/idl/drsuapi.idl
===================================================================
--- branches/SAMBA_4_0/source/librpc/idl/drsuapi.idl	2004-12-13 11:00:24 UTC (rev 4175)
+++ branches/SAMBA_4_0/source/librpc/idl/drsuapi.idl	2004-12-13 11:34:57 UTC (rev 4176)
@@ -55,8 +55,7 @@
 		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 {

Modified: branches/SAMBA_4_0/source/torture/rpc/drsuapi.c
===================================================================
--- branches/SAMBA_4_0/source/torture/rpc/drsuapi.c	2004-12-13 11:00:24 UTC (rev 4175)
+++ branches/SAMBA_4_0/source/torture/rpc/drsuapi.c	2004-12-13 11:34:57 UTC (rev 4176)
@@ -780,22 +780,18 @@
 
 		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)) {