svn commit: samba r11103 - in branches/SAMBA_4_0/source/librpc/idl: .

[jelmer at samba.org]

Author: jelmer
Date: 2005-10-16 19:21:17 +0000 (Sun, 16 Oct 2005)
New Revision: 11103

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

Log:
Eliminate ascstr

Modified:
   branches/SAMBA_4_0/source/librpc/idl/drsuapi.idl
   branches/SAMBA_4_0/source/librpc/idl/idl_types.h
   branches/SAMBA_4_0/source/librpc/idl/mgmt.idl


Changeset:
Modified: branches/SAMBA_4_0/source/librpc/idl/drsuapi.idl
===================================================================
--- branches/SAMBA_4_0/source/librpc/idl/drsuapi.idl	2005-10-16 19:12:02 UTC (rev 11102)
+++ branches/SAMBA_4_0/source/librpc/idl/drsuapi.idl	2005-10-16 19:21:17 UTC (rev 11103)
@@ -98,12 +98,12 @@
 	 * 
 	 * maybe the bind_guid could also be the invocation_id see drsuapi_DsReplicaConnection04
 	 */
-	const string DRSUAPI_DS_BIND_GUID = "e24d201a-4fd6-11d1-a3da-0000f875ae0d";
+	const char *DRSUAPI_DS_BIND_GUID = "e24d201a-4fd6-11d1-a3da-0000f875ae0d";
 	/* 
 	 * this magic guid are needed to fetch the whole tree with drsuapi_DsGetNCChanges()
 	 */
-	const string DRSUAPI_DS_BIND_GUID_W2K	= "6abec3d1-3054-41c8-a362-5a0c5b7d5d71";
-	const string DRSUAPI_DS_BIND_GUID_W2K3	= "6afab99c-6e26-464a-975f-f58f105218bc";
+	const char *DRSUAPI_DS_BIND_GUID_W2K	= "6abec3d1-3054-41c8-a362-5a0c5b7d5d71";
+	const char *DRSUAPI_DS_BIND_GUID_W2K3	= "6afab99c-6e26-464a-975f-f58f105218bc";
 
 	WERROR drsuapi_DsBind(
 		[in,unique]	    GUID *bind_guid,
@@ -714,7 +714,7 @@
 
 	typedef struct {
 		[ref] drsuapi_DsReplicaObjectIdentifier *naming_context;
-		[ref] ascstr *dest_dsa_dns_name;
+		[ref,charset(DOS),string] uint8 *dest_dsa_dns_name;
 		GUID dest_dsa_guid;
 		drsuapi_DsReplicaUpdateRefsOptions options;
 	} drsuapi_DsReplicaUpdateRefsRequest1;

Modified: branches/SAMBA_4_0/source/librpc/idl/idl_types.h
===================================================================
--- branches/SAMBA_4_0/source/librpc/idl/idl_types.h	2005-10-16 19:12:02 UTC (rev 11102)
+++ branches/SAMBA_4_0/source/librpc/idl/idl_types.h	2005-10-16 19:21:17 UTC (rev 11103)
@@ -33,12 +33,6 @@
 #define astring15       [flag(STR_ASCII|STR_FIXLEN15)] string
 
 /*
-  an ascii string prefixed with [size] [offset] [length], all 32 bits
-  null terminated
-*/
-#define ascstr		[flag(STR_ASCII|STR_SIZE4|STR_LEN4)] string
-
-/*
   an ascii string prefixed with [offset] [length], both 32 bits
   null terminated
 */

Modified: branches/SAMBA_4_0/source/librpc/idl/mgmt.idl
===================================================================
--- branches/SAMBA_4_0/source/librpc/idl/mgmt.idl	2005-10-16 19:12:02 UTC (rev 11102)
+++ branches/SAMBA_4_0/source/librpc/idl/mgmt.idl	2005-10-16 19:21:17 UTC (rev 11103)
@@ -71,6 +71,6 @@
 	WERROR mgmt_inq_princ_name (
 		[in]        uint32                  authn_proto,
 		[in]        uint32                  princ_name_size,
-		[out]       ascstr                  princ_name
+		[out]       [string,charset(DOS)] uint8 princ_name[]
 		);
 }