r11098: Replace string with [string]

(This used to be commit 1ac8c96349c1241f75f7a133cfefa0df5aaae18e)

3 files changed, 34 insertions, 34 deletions

diff --git a/source4/librpc/idl/atsvc.idl b/source4/librpc/idl/atsvc.idl
index 51904610b2..e1eb46e7e0 100644
--- a/source4/librpc/idl/atsvc.idl
+++ b/source4/librpc/idl/atsvc.idl
@@ -68,13 +68,13 @@
 		atsvc_DaysOfMonth days_of_month;
 		atsvc_DaysOfWeek days_of_week;
 		atsvc_Flags flags;
-		unistr *command;
+		[string,charset(UTF16)] uint16 *command;
 	} atsvc_JobInfo;
 
 	/******************/
 	/* Function: 0x00 */
 	NTSTATUS atsvc_JobAdd(
-		[in,unique]	 unistr *servername,
+		[in,unique,string,charset(UTF16)] uint16 *servername,
 		[in] atsvc_JobInfo *job_info,
 		[out]	 uint32 job_id
 	);
@@ -82,7 +82,7 @@
 	/******************/
 	/* Function: 0x01 */
 	NTSTATUS atsvc_JobDel(
-		[in,unique]	unistr *servername,
+		[in,unique,string,charset(UTF16)] uint16 *servername,
 		[in]	uint32 min_job_id,
 		[in]	uint32 max_job_id
 	);
@@ -93,7 +93,7 @@
 		atsvc_DaysOfMonth days_of_month;
 		atsvc_DaysOfWeek days_of_week;
 		atsvc_Flags flags;
-		unistr *command;
+		[string,charset(UTF16)] uint16 *command;
 	} atsvc_JobEnumInfo;
 
 	typedef struct {
@@ -104,7 +104,7 @@
 	/******************/
 	/* Function: 0x02 */
 	NTSTATUS atsvc_JobEnum(
-		[in,unique]  unistr *servername,
+		[in,unique,string,charset(UTF16)] uint16 *servername,
 		[in,out] 	 atsvc_enum_ctr *ctr,
 		[in]	     uint32 preferred_max_len,
 		[out]	     uint32 total_entries,
@@ -114,7 +114,7 @@
 	/******************/
 	/* Function: 0x03 */
 	[public] NTSTATUS atsvc_JobGetInfo(
-		[in,unique]	unistr *servername,
+		[in,unique,string,charset(UTF16)]	uint16 *servername,
 		[in]	uint32 job_id,
 		[out,unique]	atsvc_JobInfo *job_info
 	);
diff --git a/source4/librpc/idl/dfs.idl b/source4/librpc/idl/dfs.idl
index 579d855b89..288dd39f2e 100644
--- a/source4/librpc/idl/dfs.idl
+++ b/source4/librpc/idl/dfs.idl
@@ -20,19 +20,19 @@
 	/******************/
 	/* Function: 0x01 */
 	WERROR dfs_Add (
-		[in]     	 unistr *path,
-		[in]     	 unistr *server,
-		[in,unique]         unistr *share,
-		[in,unique]         unistr *comment,
+		[in,string,charset(UTF16)] uint16 *path,
+		[in,string,charset(UTF16)] uint16 *server,
+		[in,unique,string,charset(UTF16)] uint16 *share,
+		[in,unique,string,charset(UTF16)] uint16 *comment,
 		[in]         uint32 flags
 		);
 
 	/******************/
 	/* Function: 0x02 */
 	WERROR dfs_Remove (
-		[in] 	 		unistr *path,
-		[in,unique]     unistr *server,
-		[in,unique]     unistr *share
+		[in,string,charset(UTF16)] uint16 *path,
+		[in,unique,string,charset(UTF16)] uint16 *server,
+		[in,unique,string,charset(UTF16)] uint16 *share
 		);
 
 	/******************/
@@ -46,33 +46,33 @@
 	} dfs_Info0;
 
 	typedef struct {
-		unistr *path;
+		[string,charset(UTF16)] uint16 *path;
 	} dfs_Info1;
 
 	typedef struct {
-		unistr *path;
-		unistr *comment;
+		[string,charset(UTF16)] uint16 *path;
+		[string,charset(UTF16)] uint16 *comment;
 		uint32 state;
 		uint32 num_stores;
 	} dfs_Info2;
 
 	typedef struct {
 		uint32 state;
-		unistr *server;
-		unistr *share;
+		[string,charset(UTF16)] uint16 *server;
+		[string,charset(UTF16)] uint16 *share;
 	} dfs_StorageInfo;
 
 	typedef struct {
-		unistr *path;
-		unistr *comment;
+		[string,charset(UTF16)] uint16 *path;
+		[string,charset(UTF16)] uint16 *comment;
 		uint32 state;
 		uint32 num_stores;
 		[size_is(num_stores)] dfs_StorageInfo *stores;
 	} dfs_Info3;
 
 	typedef struct {
-		unistr *path;
-		unistr *comment;
+		[string,charset(UTF16)] uint16 *path;
+		[string,charset(UTF16)] uint16 *comment;
 		uint32 state;
 		uint32 timeout;
 		GUID   guid;
@@ -81,7 +81,7 @@
 	} dfs_Info4;
 
 	typedef struct {
-		unistr *comment;
+		[string,charset(UTF16)] uint16 *comment;
 	} dfs_Info100;
 
 	typedef struct {
@@ -93,12 +93,12 @@
 	} dfs_Info102;
 
 	typedef struct {
-		unistr *dom_root;
+		[string,charset(UTF16)] uint16 *dom_root;
 	} dfs_Info200;
 
 	typedef struct {
 		uint32 flags;
-		unistr *dom_root;
+		[string,charset(UTF16)] uint16 *dom_root;
 	} dfs_Info300;
 
 	typedef union {
@@ -113,9 +113,9 @@
 	} dfs_Info;
 
 	WERROR dfs_GetInfo (
-		[in] 	 unistr *path,
-		[in,unique]     unistr *server,
-		[in,unique]     unistr *share,
+		[in,string,charset(UTF16)] uint16 *path,
+		[in,unique,string,charset(UTF16)] uint16 *server,
+		[in,unique,string,charset(UTF16)] uint16 *share,
 		[in]     uint32 level,
 		[out,switch_is(level)] dfs_Info *info
 		);
diff --git a/source4/librpc/idl/xattr.idl b/source4/librpc/idl/xattr.idl
index ae2a084c21..48d0c76183 100644
--- a/source4/librpc/idl/xattr.idl
+++ b/source4/librpc/idl/xattr.idl
@@ -14,8 +14,8 @@
 ]
 interface xattr
 {
-	const string XATTR_DOSATTRIB_NAME = "user.DosAttrib";
-	const string XATTR_DOSATTRIB_ESTIMATED_SIZE = 64;
+	const char *XATTR_DOSATTRIB_NAME = "user.DosAttrib";
+	const int XATTR_DOSATTRIB_ESTIMATED_SIZE = 64;
 
 	/* we store basic dos attributes in a DosAttrib xattr. By
 	   using a union we can cope with new version of this
@@ -56,7 +56,7 @@ interface xattr
 
 
 	/* we store DOS style extended attributes in a DosEAs xattr */
-	const string XATTR_DOSEAS_NAME = "user.DosEAs";
+	const char *XATTR_DOSEAS_NAME = "user.DosEAs";
 
 	typedef struct {
 		utf8string name;
@@ -72,12 +72,12 @@ interface xattr
 	   the streams themselves are stored in
 	   user.DosStream.STREAMNAME or in external files, according
 	   to the flags */
-	const string XATTR_DOSSTREAMS_NAME = "user.DosStreams";
+	const char *XATTR_DOSSTREAMS_NAME = "user.DosStreams";
 
 	const int XATTR_STREAM_FLAG_INTERNAL = 0x00000001;
 
 	/* stream data is stored in attributes with the given prefix */
-	const string XATTR_DOSSTREAM_PREFIX = "user.DosStream.";
+	const char *XATTR_DOSSTREAM_PREFIX = "user.DosStream.";
 
 	const int XATTR_MAX_STREAM_SIZE = 0x4000;
 
@@ -100,7 +100,7 @@ interface xattr
 	   we put this xattr in the security namespace to ensure that
 	   only trusted users can write to the ACL
 	*/
-	const string XATTR_NTACL_NAME = "security.NTACL";
+	const char *XATTR_NTACL_NAME = "security.NTACL";
 
 	typedef [switch_type(uint16)] union {
 		[case(1)] security_descriptor *sd;