Re-run make idl (after pidl change for adding header info to cli_ functions).

Guenther
(This used to be commit 492c26a9367d93802d3b6a9271dde16c49fffe69)

28 files changed, 2964 insertions, 2964 deletions

diff --git a/source3/librpc/gen_ndr/cli_dfs.c b/source3/librpc/gen_ndr/cli_dfs.c
index fc00128f3f..0e33284816 100644
--- a/source3/librpc/gen_ndr/cli_dfs.c
+++ b/source3/librpc/gen_ndr/cli_dfs.c
@@ -8,7 +8,7 @@
 
 NTSTATUS rpccli_dfs_GetManagerVersion(struct rpc_pipe_client *cli,
 				      TALLOC_CTX *mem_ctx,
-				      enum dfs_ManagerVersion *version)
+				      enum dfs_ManagerVersion *version /* [out] [ref] */)
 {
 	struct dfs_GetManagerVersion r;
 	NTSTATUS status;
@@ -47,11 +47,11 @@ NTSTATUS rpccli_dfs_GetManagerVersion(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_dfs_Add(struct rpc_pipe_client *cli,
 			TALLOC_CTX *mem_ctx,
-			const char *path,
-			const char *server,
-			const char *share,
-			const char *comment,
-			uint32_t flags,
+			const char *path /* [in] [ref,charset(UTF16)] */,
+			const char *server /* [in] [ref,charset(UTF16)] */,
+			const char *share /* [in] [unique,charset(UTF16)] */,
+			const char *comment /* [in] [unique,charset(UTF16)] */,
+			uint32_t flags /* [in]  */,
 			WERROR *werror)
 {
 	struct dfs_Add r;
@@ -99,9 +99,9 @@ NTSTATUS rpccli_dfs_Add(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_dfs_Remove(struct rpc_pipe_client *cli,
 			   TALLOC_CTX *mem_ctx,
-			   const char *dfs_entry_path,
-			   const char *servername,
-			   const char *sharename,
+			   const char *dfs_entry_path /* [in] [ref,charset(UTF16)] */,
+			   const char *servername /* [in] [unique,charset(UTF16)] */,
+			   const char *sharename /* [in] [unique,charset(UTF16)] */,
 			   WERROR *werror)
 {
 	struct dfs_Remove r;
@@ -147,11 +147,11 @@ NTSTATUS rpccli_dfs_Remove(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_dfs_SetInfo(struct rpc_pipe_client *cli,
 			    TALLOC_CTX *mem_ctx,
-			    const char *dfs_entry_path,
-			    const char *servername,
-			    const char *sharename,
-			    uint32_t level,
-			    union dfs_Info *info,
+			    const char *dfs_entry_path /* [in] [charset(UTF16)] */,
+			    const char *servername /* [in] [unique,charset(UTF16)] */,
+			    const char *sharename /* [in] [unique,charset(UTF16)] */,
+			    uint32_t level /* [in]  */,
+			    union dfs_Info *info /* [in] [ref,switch_is(level)] */,
 			    WERROR *werror)
 {
 	struct dfs_SetInfo r;
@@ -199,11 +199,11 @@ NTSTATUS rpccli_dfs_SetInfo(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_dfs_GetInfo(struct rpc_pipe_client *cli,
 			    TALLOC_CTX *mem_ctx,
-			    const char *dfs_entry_path,
-			    const char *servername,
-			    const char *sharename,
-			    uint32_t level,
-			    union dfs_Info *info,
+			    const char *dfs_entry_path /* [in] [charset(UTF16)] */,
+			    const char *servername /* [in] [unique,charset(UTF16)] */,
+			    const char *sharename /* [in] [unique,charset(UTF16)] */,
+			    uint32_t level /* [in]  */,
+			    union dfs_Info *info /* [out] [ref,switch_is(level)] */,
 			    WERROR *werror)
 {
 	struct dfs_GetInfo r;
@@ -251,10 +251,10 @@ NTSTATUS rpccli_dfs_GetInfo(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_dfs_Enum(struct rpc_pipe_client *cli,
 			 TALLOC_CTX *mem_ctx,
-			 uint32_t level,
-			 uint32_t bufsize,
-			 struct dfs_EnumStruct *info,
-			 uint32_t *total,
+			 uint32_t level /* [in]  */,
+			 uint32_t bufsize /* [in]  */,
+			 struct dfs_EnumStruct *info /* [in,out] [unique] */,
+			 uint32_t *total /* [in,out] [unique] */,
 			 WERROR *werror)
 {
 	struct dfs_Enum r;
@@ -475,15 +475,15 @@ NTSTATUS rpccli_dfs_ManagerSendSiteInfo(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_dfs_AddFtRoot(struct rpc_pipe_client *cli,
 			      TALLOC_CTX *mem_ctx,
-			      const char *servername,
-			      const char *dns_servername,
-			      const char *dfsname,
-			      const char *rootshare,
-			      const char *comment,
-			      const char *dfs_config_dn,
-			      uint8_t unknown1,
-			      uint32_t flags,
-			      struct dfs_UnknownStruct **unknown2,
+			      const char *servername /* [in] [charset(UTF16)] */,
+			      const char *dns_servername /* [in] [charset(UTF16)] */,
+			      const char *dfsname /* [in] [charset(UTF16)] */,
+			      const char *rootshare /* [in] [charset(UTF16)] */,
+			      const char *comment /* [in] [charset(UTF16)] */,
+			      const char *dfs_config_dn /* [in] [charset(UTF16)] */,
+			      uint8_t unknown1 /* [in]  */,
+			      uint32_t flags /* [in]  */,
+			      struct dfs_UnknownStruct **unknown2 /* [in,out] [unique] */,
 			      WERROR *werror)
 {
 	struct dfs_AddFtRoot r;
@@ -538,12 +538,12 @@ NTSTATUS rpccli_dfs_AddFtRoot(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_dfs_RemoveFtRoot(struct rpc_pipe_client *cli,
 				 TALLOC_CTX *mem_ctx,
-				 const char *servername,
-				 const char *dns_servername,
-				 const char *dfsname,
-				 const char *rootshare,
-				 uint32_t flags,
-				 struct dfs_UnknownStruct **unknown,
+				 const char *servername /* [in] [charset(UTF16)] */,
+				 const char *dns_servername /* [in] [charset(UTF16)] */,
+				 const char *dfsname /* [in] [charset(UTF16)] */,
+				 const char *rootshare /* [in] [charset(UTF16)] */,
+				 uint32_t flags /* [in]  */,
+				 struct dfs_UnknownStruct **unknown /* [in,out] [unique] */,
 				 WERROR *werror)
 {
 	struct dfs_RemoveFtRoot r;
@@ -595,10 +595,10 @@ NTSTATUS rpccli_dfs_RemoveFtRoot(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_dfs_AddStdRoot(struct rpc_pipe_client *cli,
 			       TALLOC_CTX *mem_ctx,
-			       const char *servername,
-			       const char *rootshare,
-			       const char *comment,
-			       uint32_t flags,
+			       const char *servername /* [in] [charset(UTF16)] */,
+			       const char *rootshare /* [in] [charset(UTF16)] */,
+			       const char *comment /* [in] [charset(UTF16)] */,
+			       uint32_t flags /* [in]  */,
 			       WERROR *werror)
 {
 	struct dfs_AddStdRoot r;
@@ -645,9 +645,9 @@ NTSTATUS rpccli_dfs_AddStdRoot(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_dfs_RemoveStdRoot(struct rpc_pipe_client *cli,
 				  TALLOC_CTX *mem_ctx,
-				  const char *servername,
-				  const char *rootshare,
-				  uint32_t flags,
+				  const char *servername /* [in] [charset(UTF16)] */,
+				  const char *rootshare /* [in] [charset(UTF16)] */,
+				  uint32_t flags /* [in]  */,
 				  WERROR *werror)
 {
 	struct dfs_RemoveStdRoot r;
@@ -693,8 +693,8 @@ NTSTATUS rpccli_dfs_RemoveStdRoot(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_dfs_ManagerInitialize(struct rpc_pipe_client *cli,
 				      TALLOC_CTX *mem_ctx,
-				      const char *servername,
-				      uint32_t flags,
+				      const char *servername /* [in] [ref,charset(UTF16)] */,
+				      uint32_t flags /* [in]  */,
 				      WERROR *werror)
 {
 	struct dfs_ManagerInitialize r;
@@ -739,10 +739,10 @@ NTSTATUS rpccli_dfs_ManagerInitialize(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_dfs_AddStdRootForced(struct rpc_pipe_client *cli,
 				     TALLOC_CTX *mem_ctx,
-				     const char *servername,
-				     const char *rootshare,
-				     const char *comment,
-				     const char *store,
+				     const char *servername /* [in] [charset(UTF16)] */,
+				     const char *rootshare /* [in] [charset(UTF16)] */,
+				     const char *comment /* [in] [charset(UTF16)] */,
+				     const char *store /* [in] [charset(UTF16)] */,
 				     WERROR *werror)
 {
 	struct dfs_AddStdRootForced r;
@@ -789,10 +789,10 @@ NTSTATUS rpccli_dfs_AddStdRootForced(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_dfs_GetDcAddress(struct rpc_pipe_client *cli,
 				 TALLOC_CTX *mem_ctx,
-				 const char *servername,
-				 const char **server_fullname,
-				 uint8_t *is_root,
-				 uint32_t *ttl,
+				 const char *servername /* [in] [charset(UTF16)] */,
+				 const char **server_fullname /* [in,out] [ref,charset(UTF16)] */,
+				 uint8_t *is_root /* [in,out] [ref] */,
+				 uint32_t *ttl /* [in,out] [ref] */,
 				 WERROR *werror)
 {
 	struct dfs_GetDcAddress r;
@@ -842,10 +842,10 @@ NTSTATUS rpccli_dfs_GetDcAddress(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_dfs_SetDcAddress(struct rpc_pipe_client *cli,
 				 TALLOC_CTX *mem_ctx,
-				 const char *servername,
-				 const char *server_fullname,
-				 uint32_t flags,
-				 uint32_t ttl,
+				 const char *servername /* [in] [charset(UTF16)] */,
+				 const char *server_fullname /* [in] [charset(UTF16)] */,
+				 uint32_t flags /* [in]  */,
+				 uint32_t ttl /* [in]  */,
 				 WERROR *werror)
 {
 	struct dfs_SetDcAddress r;
@@ -892,8 +892,8 @@ NTSTATUS rpccli_dfs_SetDcAddress(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_dfs_FlushFtTable(struct rpc_pipe_client *cli,
 				 TALLOC_CTX *mem_ctx,
-				 const char *servername,
-				 const char *rootshare,
+				 const char *servername /* [in] [charset(UTF16)] */,
+				 const char *rootshare /* [in] [charset(UTF16)] */,
 				 WERROR *werror)
 {
 	struct dfs_FlushFtTable r;
@@ -1022,11 +1022,11 @@ NTSTATUS rpccli_dfs_Remove2(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_dfs_EnumEx(struct rpc_pipe_client *cli,
 			   TALLOC_CTX *mem_ctx,
-			   const char *dfs_name,
-			   uint32_t level,
-			   uint32_t bufsize,
-			   struct dfs_EnumStruct *info,
-			   uint32_t *total,
+			   const char *dfs_name /* [in] [charset(UTF16)] */,
+			   uint32_t level /* [in]  */,
+			   uint32_t bufsize /* [in]  */,
+			   struct dfs_EnumStruct *info /* [in,out] [unique] */,
+			   uint32_t *total /* [in,out] [unique] */,
 			   WERROR *werror)
 {
 	struct dfs_EnumEx r;
diff --git a/source3/librpc/gen_ndr/cli_dfs.h b/source3/librpc/gen_ndr/cli_dfs.h
index d23bb90470..0c862099bf 100644
--- a/source3/librpc/gen_ndr/cli_dfs.h
+++ b/source3/librpc/gen_ndr/cli_dfs.h
@@ -3,43 +3,43 @@
 #define __CLI_NETDFS__
 NTSTATUS rpccli_dfs_GetManagerVersion(struct rpc_pipe_client *cli,
 				      TALLOC_CTX *mem_ctx,
-				      enum dfs_ManagerVersion *version);
+				      enum dfs_ManagerVersion *version /* [out] [ref] */);
 NTSTATUS rpccli_dfs_Add(struct rpc_pipe_client *cli,
 			TALLOC_CTX *mem_ctx,
-			const char *path,
-			const char *server,
-			const char *share,
-			const char *comment,
-			uint32_t flags,
+			const char *path /* [in] [ref,charset(UTF16)] */,
+			const char *server /* [in] [ref,charset(UTF16)] */,
+			const char *share /* [in] [unique,charset(UTF16)] */,
+			const char *comment /* [in] [unique,charset(UTF16)] */,
+			uint32_t flags /* [in]  */,
 			WERROR *werror);
 NTSTATUS rpccli_dfs_Remove(struct rpc_pipe_client *cli,
 			   TALLOC_CTX *mem_ctx,
-			   const char *dfs_entry_path,
-			   const char *servername,
-			   const char *sharename,
+			   const char *dfs_entry_path /* [in] [ref,charset(UTF16)] */,
+			   const char *servername /* [in] [unique,charset(UTF16)] */,
+			   const char *sharename /* [in] [unique,charset(UTF16)] */,
 			   WERROR *werror);
 NTSTATUS rpccli_dfs_SetInfo(struct rpc_pipe_client *cli,
 			    TALLOC_CTX *mem_ctx,
-			    const char *dfs_entry_path,
-			    const char *servername,
-			    const char *sharename,
-			    uint32_t level,
-			    union dfs_Info *info,
+			    const char *dfs_entry_path /* [in] [charset(UTF16)] */,
+			    const char *servername /* [in] [unique,charset(UTF16)] */,
+			    const char *sharename /* [in] [unique,charset(UTF16)] */,
+			    uint32_t level /* [in]  */,
+			    union dfs_Info *info /* [in] [ref,switch_is(level)] */,
 			    WERROR *werror);
 NTSTATUS rpccli_dfs_GetInfo(struct rpc_pipe_client *cli,
 			    TALLOC_CTX *mem_ctx,
-			    const char *dfs_entry_path,
-			    const char *servername,
-			    const char *sharename,
-			    uint32_t level,
-			    union dfs_Info *info,
+			    const char *dfs_entry_path /* [in] [charset(UTF16)] */,
+			    const char *servername /* [in] [unique,charset(UTF16)] */,
+			    const char *sharename /* [in] [unique,charset(UTF16)] */,
+			    uint32_t level /* [in]  */,
+			    union dfs_Info *info /* [out] [ref,switch_is(level)] */,
 			    WERROR *werror);
 NTSTATUS rpccli_dfs_Enum(struct rpc_pipe_client *cli,
 			 TALLOC_CTX *mem_ctx,
-			 uint32_t level,
-			 uint32_t bufsize,
-			 struct dfs_EnumStruct *info,
-			 uint32_t *total,
+			 uint32_t level /* [in]  */,
+			 uint32_t bufsize /* [in]  */,
+			 struct dfs_EnumStruct *info /* [in,out] [unique] */,
+			 uint32_t *total /* [in,out] [unique] */,
 			 WERROR *werror);
 NTSTATUS rpccli_dfs_Rename(struct rpc_pipe_client *cli,
 			   TALLOC_CTX *mem_ctx,
@@ -55,68 +55,68 @@ NTSTATUS rpccli_dfs_ManagerSendSiteInfo(struct rpc_pipe_client *cli,
 					WERROR *werror);
 NTSTATUS rpccli_dfs_AddFtRoot(struct rpc_pipe_client *cli,
 			      TALLOC_CTX *mem_ctx,
-			      const char *servername,
-			      const char *dns_servername,
-			      const char *dfsname,
-			      const char *rootshare,
-			      const char *comment,
-			      const char *dfs_config_dn,
-			      uint8_t unknown1,
-			      uint32_t flags,
-			      struct dfs_UnknownStruct **unknown2,
+			      const char *servername /* [in] [charset(UTF16)] */,
+			      const char *dns_servername /* [in] [charset(UTF16)] */,
+			      const char *dfsname /* [in] [charset(UTF16)] */,
+			      const char *rootshare /* [in] [charset(UTF16)] */,
+			      const char *comment /* [in] [charset(UTF16)] */,
+			      const char *dfs_config_dn /* [in] [charset(UTF16)] */,
+			      uint8_t unknown1 /* [in]  */,
+			      uint32_t flags /* [in]  */,
+			      struct dfs_UnknownStruct **unknown2 /* [in,out] [unique] */,
 			      WERROR *werror);
 NTSTATUS rpccli_dfs_RemoveFtRoot(struct rpc_pipe_client *cli,
 				 TALLOC_CTX *mem_ctx,
-				 const char *servername,
-				 const char *dns_servername,
-				 const char *dfsname,
-				 const char *rootshare,
-				 uint32_t flags,
-				 struct dfs_UnknownStruct **unknown,
+				 const char *servername /* [in] [charset(UTF16)] */,
+				 const char *dns_servername /* [in] [charset(UTF16)] */,
+				 const char *dfsname /* [in] [charset(UTF16)] */,
+				 const char *rootshare /* [in] [charset(UTF16)] */,
+				 uint32_t flags /* [in]  */,
+				 struct dfs_UnknownStruct **unknown /* [in,out] [unique] */,
 				 WERROR *werror);
 NTSTATUS rpccli_dfs_AddStdRoot(struct rpc_pipe_client *cli,
 			       TALLOC_CTX *mem_ctx,
-			       const char *servername,
-			       const char *rootshare,
-			       const char *comment,
-			       uint32_t flags,
+			       const char *servername /* [in] [charset(UTF16)] */,
+			       const char *rootshare /* [in] [charset(UTF16)] */,
+			       const char *comment /* [in] [charset(UTF16)] */,
+			       uint32_t flags /* [in]  */,
 			       WERROR *werror);
 NTSTATUS rpccli_dfs_RemoveStdRoot(struct rpc_pipe_client *cli,
 				  TALLOC_CTX *mem_ctx,
-				  const char *servername,
-				  const char *rootshare,
-				  uint32_t flags,
+				  const char *servername /* [in] [charset(UTF16)] */,
+				  const char *rootshare /* [in] [charset(UTF16)] */,
+				  uint32_t flags /* [in]  */,
 				  WERROR *werror);
 NTSTATUS rpccli_dfs_ManagerInitialize(struct rpc_pipe_client *cli,
 				      TALLOC_CTX *mem_ctx,
-				      const char *servername,
-				      uint32_t flags,
+				      const char *servername /* [in] [ref,charset(UTF16)] */,
+				      uint32_t flags /* [in]  */,
 				      WERROR *werror);
 NTSTATUS rpccli_dfs_AddStdRootForced(struct rpc_pipe_client *cli,
 				     TALLOC_CTX *mem_ctx,
-				     const char *servername,
-				     const char *rootshare,
-				     const char *comment,
-				     const char *store,
+				     const char *servername /* [in] [charset(UTF16)] */,
+				     const char *rootshare /* [in] [charset(UTF16)] */,
+				     const char *comment /* [in] [charset(UTF16)] */,
+				     const char *store /* [in] [charset(UTF16)] */,
 				     WERROR *werror);
 NTSTATUS rpccli_dfs_GetDcAddress(struct rpc_pipe_client *cli,
 				 TALLOC_CTX *mem_ctx,
-				 const char *servername,
-				 const char **server_fullname,
-				 uint8_t *is_root,
-				 uint32_t *ttl,
+				 const char *servername /* [in] [charset(UTF16)] */,
+				 const char **server_fullname /* [in,out] [ref,charset(UTF16)] */,
+				 uint8_t *is_root /* [in,out] [ref] */,
+				 uint32_t *ttl /* [in,out] [ref] */,
 				 WERROR *werror);
 NTSTATUS rpccli_dfs_SetDcAddress(struct rpc_pipe_client *cli,
 				 TALLOC_CTX *mem_ctx,
-				 const char *servername,
-				 const char *server_fullname,
-				 uint32_t flags,
-				 uint32_t ttl,
+				 const char *servername /* [in] [charset(UTF16)] */,
+				 const char *server_fullname /* [in] [charset(UTF16)] */,
+				 uint32_t flags /* [in]  */,
+				 uint32_t ttl /* [in]  */,
 				 WERROR *werror);
 NTSTATUS rpccli_dfs_FlushFtTable(struct rpc_pipe_client *cli,
 				 TALLOC_CTX *mem_ctx,
-				 const char *servername,
-				 const char *rootshare,
+				 const char *servername /* [in] [charset(UTF16)] */,
+				 const char *rootshare /* [in] [charset(UTF16)] */,
 				 WERROR *werror);
 NTSTATUS rpccli_dfs_Add2(struct rpc_pipe_client *cli,
 			 TALLOC_CTX *mem_ctx,
@@ -126,11 +126,11 @@ NTSTATUS rpccli_dfs_Remove2(struct rpc_pipe_client *cli,
 			    WERROR *werror);
 NTSTATUS rpccli_dfs_EnumEx(struct rpc_pipe_client *cli,
 			   TALLOC_CTX *mem_ctx,
-			   const char *dfs_name,
-			   uint32_t level,
-			   uint32_t bufsize,
-			   struct dfs_EnumStruct *info,
-			   uint32_t *total,
+			   const char *dfs_name /* [in] [charset(UTF16)] */,
+			   uint32_t level /* [in]  */,
+			   uint32_t bufsize /* [in]  */,
+			   struct dfs_EnumStruct *info /* [in,out] [unique] */,
+			   uint32_t *total /* [in,out] [unique] */,
 			   WERROR *werror);
 NTSTATUS rpccli_dfs_SetInfo2(struct rpc_pipe_client *cli,
 			     TALLOC_CTX *mem_ctx,
diff --git a/source3/librpc/gen_ndr/cli_dssetup.c b/source3/librpc/gen_ndr/cli_dssetup.c
index 8947d99bb5..f379b1b8a9 100644
--- a/source3/librpc/gen_ndr/cli_dssetup.c
+++ b/source3/librpc/gen_ndr/cli_dssetup.c
@@ -8,8 +8,8 @@
 
 NTSTATUS rpccli_dssetup_DsRoleGetPrimaryDomainInformation(struct rpc_pipe_client *cli,
 							  TALLOC_CTX *mem_ctx,
-							  enum dssetup_DsRoleInfoLevel level,
-							  union dssetup_DsRoleInfo *info,
+							  enum dssetup_DsRoleInfoLevel level /* [in]  */,
+							  union dssetup_DsRoleInfo *info /* [out] [unique,switch_is(level)] */,
 							  WERROR *werror)
 {
 	struct dssetup_DsRoleGetPrimaryDomainInformation r;
diff --git a/source3/librpc/gen_ndr/cli_dssetup.h b/source3/librpc/gen_ndr/cli_dssetup.h
index b645c26829..e2dca43360 100644
--- a/source3/librpc/gen_ndr/cli_dssetup.h
+++ b/source3/librpc/gen_ndr/cli_dssetup.h
@@ -3,8 +3,8 @@
 #define __CLI_DSSETUP__
 NTSTATUS rpccli_dssetup_DsRoleGetPrimaryDomainInformation(struct rpc_pipe_client *cli,
 							  TALLOC_CTX *mem_ctx,
-							  enum dssetup_DsRoleInfoLevel level,
-							  union dssetup_DsRoleInfo *info,
+							  enum dssetup_DsRoleInfoLevel level /* [in]  */,
+							  union dssetup_DsRoleInfo *info /* [out] [unique,switch_is(level)] */,
 							  WERROR *werror);
 NTSTATUS rpccli_dssetup_DsRoleDnsNameToFlatName(struct rpc_pipe_client *cli,
 						TALLOC_CTX *mem_ctx,
diff --git a/source3/librpc/gen_ndr/cli_echo.c b/source3/librpc/gen_ndr/cli_echo.c
index d2ef574821..addeef65b5 100644
--- a/source3/librpc/gen_ndr/cli_echo.c
+++ b/source3/librpc/gen_ndr/cli_echo.c
@@ -8,8 +8,8 @@
 
 NTSTATUS rpccli_echo_AddOne(struct rpc_pipe_client *cli,
 			    TALLOC_CTX *mem_ctx,
-			    uint32_t in_data,
-			    uint32_t *out_data)
+			    uint32_t in_data /* [in]  */,
+			    uint32_t *out_data /* [out] [ref] */)
 {
 	struct echo_AddOne r;
 	NTSTATUS status;
@@ -49,9 +49,9 @@ NTSTATUS rpccli_echo_AddOne(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_echo_EchoData(struct rpc_pipe_client *cli,
 			      TALLOC_CTX *mem_ctx,
-			      uint32_t len,
-			      uint8_t *in_data,
-			      uint8_t *out_data)
+			      uint32_t len /* [in]  */,
+			      uint8_t *in_data /* [in] [size_is(len)] */,
+			      uint8_t *out_data /* [out] [size_is(len)] */)
 {
 	struct echo_EchoData r;
 	NTSTATUS status;
@@ -92,8 +92,8 @@ NTSTATUS rpccli_echo_EchoData(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_echo_SinkData(struct rpc_pipe_client *cli,
 			      TALLOC_CTX *mem_ctx,
-			      uint32_t len,
-			      uint8_t *data)
+			      uint32_t len /* [in]  */,
+			      uint8_t *data /* [in] [size_is(len)] */)
 {
 	struct echo_SinkData r;
 	NTSTATUS status;
@@ -133,8 +133,8 @@ NTSTATUS rpccli_echo_SinkData(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_echo_SourceData(struct rpc_pipe_client *cli,
 				TALLOC_CTX *mem_ctx,
-				uint32_t len,
-				uint8_t *data)
+				uint32_t len /* [in]  */,
+				uint8_t *data /* [out] [size_is(len)] */)
 {
 	struct echo_SourceData r;
 	NTSTATUS status;
@@ -174,8 +174,8 @@ NTSTATUS rpccli_echo_SourceData(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_echo_TestCall(struct rpc_pipe_client *cli,
 			      TALLOC_CTX *mem_ctx,
-			      const char *s1,
-			      const char **s2)
+			      const char *s1 /* [in] [ref,charset(UTF16)] */,
+			      const char **s2 /* [out] [ref,charset(UTF16)] */)
 {
 	struct echo_TestCall r;
 	NTSTATUS status;
@@ -215,8 +215,8 @@ NTSTATUS rpccli_echo_TestCall(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_echo_TestCall2(struct rpc_pipe_client *cli,
 			       TALLOC_CTX *mem_ctx,
-			       uint16_t level,
-			       union echo_Info *info)
+			       uint16_t level /* [in]  */,
+			       union echo_Info *info /* [out] [ref,switch_is(level)] */)
 {
 	struct echo_TestCall2 r;
 	NTSTATUS status;
@@ -256,7 +256,7 @@ NTSTATUS rpccli_echo_TestCall2(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_echo_TestSleep(struct rpc_pipe_client *cli,
 			       TALLOC_CTX *mem_ctx,
-			       uint32_t seconds)
+			       uint32_t seconds /* [in]  */)
 {
 	struct echo_TestSleep r;
 	NTSTATUS status;
@@ -295,9 +295,9 @@ NTSTATUS rpccli_echo_TestSleep(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_echo_TestEnum(struct rpc_pipe_client *cli,
 			      TALLOC_CTX *mem_ctx,
-			      enum echo_Enum1 *foo1,
-			      struct echo_Enum2 *foo2,
-			      union echo_Enum3 *foo3)
+			      enum echo_Enum1 *foo1 /* [in,out] [ref] */,
+			      struct echo_Enum2 *foo2 /* [in,out] [ref] */,
+			      union echo_Enum3 *foo3 /* [in,out] [ref,switch_is(*foo1)] */)
 {
 	struct echo_TestEnum r;
 	NTSTATUS status;
@@ -341,7 +341,7 @@ NTSTATUS rpccli_echo_TestEnum(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_echo_TestSurrounding(struct rpc_pipe_client *cli,
 				     TALLOC_CTX *mem_ctx,
-				     struct echo_Surrounding *data)
+				     struct echo_Surrounding *data /* [in,out] [ref] */)
 {
 	struct echo_TestSurrounding r;
 	NTSTATUS status;
@@ -381,7 +381,7 @@ NTSTATUS rpccli_echo_TestSurrounding(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_echo_TestDoublePointer(struct rpc_pipe_client *cli,
 				       TALLOC_CTX *mem_ctx,
-				       uint16_t ***data)
+				       uint16_t ***data /* [in] [ref] */)
 {
 	struct echo_TestDoublePointer r;
 	NTSTATUS status;
diff --git a/source3/librpc/gen_ndr/cli_echo.h b/source3/librpc/gen_ndr/cli_echo.h
index e682004c16..9da13e97f6 100644
--- a/source3/librpc/gen_ndr/cli_echo.h
+++ b/source3/librpc/gen_ndr/cli_echo.h
@@ -3,41 +3,41 @@
 #define __CLI_RPCECHO__
 NTSTATUS rpccli_echo_AddOne(struct rpc_pipe_client *cli,
 			    TALLOC_CTX *mem_ctx,
-			    uint32_t in_data,
-			    uint32_t *out_data);
+			    uint32_t in_data /* [in]  */,
+			    uint32_t *out_data /* [out] [ref] */);
 NTSTATUS rpccli_echo_EchoData(struct rpc_pipe_client *cli,
 			      TALLOC_CTX *mem_ctx,
-			      uint32_t len,
-			      uint8_t *in_data,
-			      uint8_t *out_data);
+			      uint32_t len /* [in]  */,
+			      uint8_t *in_data /* [in] [size_is(len)] */,
+			      uint8_t *out_data /* [out] [size_is(len)] */);
 NTSTATUS rpccli_echo_SinkData(struct rpc_pipe_client *cli,
 			      TALLOC_CTX *mem_ctx,
-			      uint32_t len,
-			      uint8_t *data);
+			      uint32_t len /* [in]  */,
+			      uint8_t *data /* [in] [size_is(len)] */);
 NTSTATUS rpccli_echo_SourceData(struct rpc_pipe_client *cli,
 				TALLOC_CTX *mem_ctx,
-				uint32_t len,
-				uint8_t *data);
+				uint32_t len /* [in]  */,
+				uint8_t *data /* [out] [size_is(len)] */);
 NTSTATUS rpccli_echo_TestCall(struct rpc_pipe_client *cli,
 			      TALLOC_CTX *mem_ctx,
-			      const char *s1,
-			      const char **s2);
+			      const char *s1 /* [in] [ref,charset(UTF16)] */,
+			      const char **s2 /* [out] [ref,charset(UTF16)] */);
 NTSTATUS rpccli_echo_TestCall2(struct rpc_pipe_client *cli,
 			       TALLOC_CTX *mem_ctx,
-			       uint16_t level,
-			       union echo_Info *info);
+			       uint16_t level /* [in]  */,
+			       union echo_Info *info /* [out] [ref,switch_is(level)] */);
 NTSTATUS rpccli_echo_TestSleep(struct rpc_pipe_client *cli,
 			       TALLOC_CTX *mem_ctx,
-			       uint32_t seconds);
+			       uint32_t seconds /* [in]  */);
 NTSTATUS rpccli_echo_TestEnum(struct rpc_pipe_client *cli,
 			      TALLOC_CTX *mem_ctx,
-			      enum echo_Enum1 *foo1,
-			      struct echo_Enum2 *foo2,
-			      union echo_Enum3 *foo3);
+			      enum echo_Enum1 *foo1 /* [in,out] [ref] */,
+			      struct echo_Enum2 *foo2 /* [in,out] [ref] */,
+			      union echo_Enum3 *foo3 /* [in,out] [ref,switch_is(*foo1)] */);
 NTSTATUS rpccli_echo_TestSurrounding(struct rpc_pipe_client *cli,
 				     TALLOC_CTX *mem_ctx,
-				     struct echo_Surrounding *data);
+				     struct echo_Surrounding *data /* [in,out] [ref] */);
 NTSTATUS rpccli_echo_TestDoublePointer(struct rpc_pipe_client *cli,
 				       TALLOC_CTX *mem_ctx,
-				       uint16_t ***data);
+				       uint16_t ***data /* [in] [ref] */);
 #endif /* __CLI_RPCECHO__ */
diff --git a/source3/librpc/gen_ndr/cli_epmapper.c b/source3/librpc/gen_ndr/cli_epmapper.c
index 775e349cd2..5a91f05b83 100644
--- a/source3/librpc/gen_ndr/cli_epmapper.c
+++ b/source3/librpc/gen_ndr/cli_epmapper.c
@@ -8,9 +8,9 @@
 
 NTSTATUS rpccli_epm_Insert(struct rpc_pipe_client *cli,
 			   TALLOC_CTX *mem_ctx,
-			   uint32_t num_ents,
-			   struct epm_entry_t *entries,
-			   uint32_t replace)
+			   uint32_t num_ents /* [in]  */,
+			   struct epm_entry_t *entries /* [in] [size_is(num_ents)] */,
+			   uint32_t replace /* [in]  */)
 {
 	struct epm_Insert r;
 	NTSTATUS status;
@@ -51,8 +51,8 @@ NTSTATUS rpccli_epm_Insert(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_epm_Delete(struct rpc_pipe_client *cli,
 			   TALLOC_CTX *mem_ctx,
-			   uint32_t num_ents,
-			   struct epm_entry_t *entries)
+			   uint32_t num_ents /* [in]  */,
+			   struct epm_entry_t *entries /* [in] [size_is(num_ents)] */)
 {
 	struct epm_Delete r;
 	NTSTATUS status;
@@ -92,14 +92,14 @@ NTSTATUS rpccli_epm_Delete(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_epm_Lookup(struct rpc_pipe_client *cli,
 			   TALLOC_CTX *mem_ctx,
-			   uint32_t inquiry_type,
-			   struct GUID *object,
-			   struct rpc_if_id_t *interface_id,
-			   uint32_t vers_option,
-			   struct policy_handle *entry_handle,
-			   uint32_t max_ents,
-			   uint32_t *num_ents,
-			   struct epm_entry_t *entries)
+			   uint32_t inquiry_type /* [in]  */,
+			   struct GUID *object /* [in] [ptr] */,
+			   struct rpc_if_id_t *interface_id /* [in] [ptr] */,
+			   uint32_t vers_option /* [in]  */,
+			   struct policy_handle *entry_handle /* [in,out] [ref] */,
+			   uint32_t max_ents /* [in]  */,
+			   uint32_t *num_ents /* [out] [ref] */,
+			   struct epm_entry_t *entries /* [out] [length_is(*num_ents),size_is(max_ents)] */)
 {
 	struct epm_Lookup r;
 	NTSTATUS status;
@@ -146,12 +146,12 @@ NTSTATUS rpccli_epm_Lookup(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_epm_Map(struct rpc_pipe_client *cli,
 			TALLOC_CTX *mem_ctx,
-			struct GUID *object,
-			struct epm_twr_t *map_tower,
-			struct policy_handle *entry_handle,
-			uint32_t max_towers,
-			uint32_t *num_towers,
-			struct epm_twr_p_t *towers)
+			struct GUID *object /* [in] [ptr] */,
+			struct epm_twr_t *map_tower /* [in] [ptr] */,
+			struct policy_handle *entry_handle /* [in,out] [ref] */,
+			uint32_t max_towers /* [in]  */,
+			uint32_t *num_towers /* [out] [ref] */,
+			struct epm_twr_p_t *towers /* [out] [length_is(*num_towers),size_is(max_towers)] */)
 {
 	struct epm_Map r;
 	NTSTATUS status;
@@ -196,7 +196,7 @@ NTSTATUS rpccli_epm_Map(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_epm_LookupHandleFree(struct rpc_pipe_client *cli,
 				     TALLOC_CTX *mem_ctx,
-				     struct policy_handle *entry_handle)
+				     struct policy_handle *entry_handle /* [in,out] [ref] */)
 {
 	struct epm_LookupHandleFree r;
 	NTSTATUS status;
@@ -236,7 +236,7 @@ NTSTATUS rpccli_epm_LookupHandleFree(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_epm_InqObject(struct rpc_pipe_client *cli,
 			      TALLOC_CTX *mem_ctx,
-			      struct GUID *epm_object)
+			      struct GUID *epm_object /* [in] [ref] */)
 {
 	struct epm_InqObject r;
 	NTSTATUS status;
@@ -275,9 +275,9 @@ NTSTATUS rpccli_epm_InqObject(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_epm_MgmtDelete(struct rpc_pipe_client *cli,
 			       TALLOC_CTX *mem_ctx,
-			       uint32_t object_speced,
-			       struct GUID *object,
-			       struct epm_twr_t *tower)
+			       uint32_t object_speced /* [in]  */,
+			       struct GUID *object /* [in] [ptr] */,
+			       struct epm_twr_t *tower /* [in] [ptr] */)
 {
 	struct epm_MgmtDelete r;
 	NTSTATUS status;
diff --git a/source3/librpc/gen_ndr/cli_epmapper.h b/source3/librpc/gen_ndr/cli_epmapper.h
index fe99e6441c..44884fad7e 100644
--- a/source3/librpc/gen_ndr/cli_epmapper.h
+++ b/source3/librpc/gen_ndr/cli_epmapper.h
@@ -3,42 +3,42 @@
 #define __CLI_EPMAPPER__
 NTSTATUS rpccli_epm_Insert(struct rpc_pipe_client *cli,
 			   TALLOC_CTX *mem_ctx,
-			   uint32_t num_ents,
-			   struct epm_entry_t *entries,
-			   uint32_t replace);
+			   uint32_t num_ents /* [in]  */,
+			   struct epm_entry_t *entries /* [in] [size_is(num_ents)] */,
+			   uint32_t replace /* [in]  */);
 NTSTATUS rpccli_epm_Delete(struct rpc_pipe_client *cli,
 			   TALLOC_CTX *mem_ctx,
-			   uint32_t num_ents,
-			   struct epm_entry_t *entries);
+			   uint32_t num_ents /* [in]  */,
+			   struct epm_entry_t *entries /* [in] [size_is(num_ents)] */);
 NTSTATUS rpccli_epm_Lookup(struct rpc_pipe_client *cli,
 			   TALLOC_CTX *mem_ctx,
-			   uint32_t inquiry_type,
-			   struct GUID *object,
-			   struct rpc_if_id_t *interface_id,
-			   uint32_t vers_option,
-			   struct policy_handle *entry_handle,
-			   uint32_t max_ents,
-			   uint32_t *num_ents,
-			   struct epm_entry_t *entries);
+			   uint32_t inquiry_type /* [in]  */,
+			   struct GUID *object /* [in] [ptr] */,
+			   struct rpc_if_id_t *interface_id /* [in] [ptr] */,
+			   uint32_t vers_option /* [in]  */,
+			   struct policy_handle *entry_handle /* [in,out] [ref] */,
+			   uint32_t max_ents /* [in]  */,
+			   uint32_t *num_ents /* [out] [ref] */,
+			   struct epm_entry_t *entries /* [out] [length_is(*num_ents),size_is(max_ents)] */);
 NTSTATUS rpccli_epm_Map(struct rpc_pipe_client *cli,
 			TALLOC_CTX *mem_ctx,
-			struct GUID *object,
-			struct epm_twr_t *map_tower,
-			struct policy_handle *entry_handle,
-			uint32_t max_towers,
-			uint32_t *num_towers,
-			struct epm_twr_p_t *towers);
+			struct GUID *object /* [in] [ptr] */,
+			struct epm_twr_t *map_tower /* [in] [ptr] */,
+			struct policy_handle *entry_handle /* [in,out] [ref] */,
+			uint32_t max_towers /* [in]  */,
+			uint32_t *num_towers /* [out] [ref] */,
+			struct epm_twr_p_t *towers /* [out] [length_is(*num_towers),size_is(max_towers)] */);
 NTSTATUS rpccli_epm_LookupHandleFree(struct rpc_pipe_client *cli,
 				     TALLOC_CTX *mem_ctx,
-				     struct policy_handle *entry_handle);
+				     struct policy_handle *entry_handle /* [in,out] [ref] */);
 NTSTATUS rpccli_epm_InqObject(struct rpc_pipe_client *cli,
 			      TALLOC_CTX *mem_ctx,
-			      struct GUID *epm_object);
+			      struct GUID *epm_object /* [in] [ref] */);
 NTSTATUS rpccli_epm_MgmtDelete(struct rpc_pipe_client *cli,
 			       TALLOC_CTX *mem_ctx,
-			       uint32_t object_speced,
-			       struct GUID *object,
-			       struct epm_twr_t *tower);
+			       uint32_t object_speced /* [in]  */,
+			       struct GUID *object /* [in] [ptr] */,
+			       struct epm_twr_t *tower /* [in] [ptr] */);
 NTSTATUS rpccli_epm_MapAuth(struct rpc_pipe_client *cli,
 			    TALLOC_CTX *mem_ctx);
 #endif /* __CLI_EPMAPPER__ */
diff --git a/source3/librpc/gen_ndr/cli_eventlog.c b/source3/librpc/gen_ndr/cli_eventlog.c
index 0084776a08..795995f5ee 100644
--- a/source3/librpc/gen_ndr/cli_eventlog.c
+++ b/source3/librpc/gen_ndr/cli_eventlog.c
@@ -8,8 +8,8 @@
 
 NTSTATUS rpccli_eventlog_ClearEventLogW(struct rpc_pipe_client *cli,
 					TALLOC_CTX *mem_ctx,
-					struct policy_handle *handle,
-					struct lsa_String *backupfile)
+					struct policy_handle *handle /* [in] [ref] */,
+					struct lsa_String *backupfile /* [in] [unique] */)
 {
 	struct eventlog_ClearEventLogW r;
 	NTSTATUS status;
@@ -86,7 +86,7 @@ NTSTATUS rpccli_eventlog_BackupEventLogW(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_eventlog_CloseEventLog(struct rpc_pipe_client *cli,
 				       TALLOC_CTX *mem_ctx,
-				       struct policy_handle *handle)
+				       struct policy_handle *handle /* [in,out] [ref] */)
 {
 	struct eventlog_CloseEventLog r;
 	NTSTATUS status;
@@ -163,8 +163,8 @@ NTSTATUS rpccli_eventlog_DeregisterEventSource(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_eventlog_GetNumRecords(struct rpc_pipe_client *cli,
 				       TALLOC_CTX *mem_ctx,
-				       struct policy_handle *handle,
-				       uint32_t *number)
+				       struct policy_handle *handle /* [in] [ref] */,
+				       uint32_t *number /* [out] [ref] */)
 {
 	struct eventlog_GetNumRecords r;
 	NTSTATUS status;
@@ -204,8 +204,8 @@ NTSTATUS rpccli_eventlog_GetNumRecords(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_eventlog_GetOldestRecord(struct rpc_pipe_client *cli,
 					 TALLOC_CTX *mem_ctx,
-					 struct policy_handle *handle,
-					 uint32_t *oldest_entry)
+					 struct policy_handle *handle /* [in] [ref] */,
+					 uint32_t *oldest_entry /* [out] [ref] */)
 {
 	struct eventlog_GetOldestRecord r;
 	NTSTATUS status;
@@ -282,12 +282,12 @@ NTSTATUS rpccli_eventlog_ChangeNotify(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_eventlog_OpenEventLogW(struct rpc_pipe_client *cli,
 				       TALLOC_CTX *mem_ctx,
-				       struct eventlog_OpenUnknown0 *unknown0,
-				       struct lsa_String *logname,
-				       struct lsa_String *servername,
-				       uint32_t unknown2,
-				       uint32_t unknown3,
-				       struct policy_handle *handle)
+				       struct eventlog_OpenUnknown0 *unknown0 /* [in] [unique] */,
+				       struct lsa_String *logname /* [in] [ref] */,
+				       struct lsa_String *servername /* [in] [ref] */,
+				       uint32_t unknown2 /* [in]  */,
+				       uint32_t unknown3 /* [in]  */,
+				       struct policy_handle *handle /* [out] [ref] */)
 {
 	struct eventlog_OpenEventLogW r;
 	NTSTATUS status;
@@ -405,13 +405,13 @@ NTSTATUS rpccli_eventlog_OpenBackupEventLogW(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_eventlog_ReadEventLogW(struct rpc_pipe_client *cli,
 				       TALLOC_CTX *mem_ctx,
-				       struct policy_handle *handle,
-				       uint32_t flags,
-				       uint32_t offset,
-				       uint32_t number_of_bytes,
-				       uint8_t *data,
-				       uint32_t *sent_size,
-				       uint32_t *real_size)
+				       struct policy_handle *handle /* [in] [ref] */,
+				       uint32_t flags /* [in]  */,
+				       uint32_t offset /* [in]  */,
+				       uint32_t number_of_bytes /* [in] [range(0,0x7FFFF)] */,
+				       uint8_t *data /* [out] [ref,size_is(number_of_bytes)] */,
+				       uint32_t *sent_size /* [out] [ref] */,
+				       uint32_t *real_size /* [out] [ref] */)
 {
 	struct eventlog_ReadEventLogW r;
 	NTSTATUS status;
@@ -900,7 +900,7 @@ NTSTATUS rpccli_eventlog_GetLogIntormation(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_eventlog_FlushEventLog(struct rpc_pipe_client *cli,
 				       TALLOC_CTX *mem_ctx,
-				       struct policy_handle *handle)
+				       struct policy_handle *handle /* [in] [ref] */)
 {
 	struct eventlog_FlushEventLog r;
 	NTSTATUS status;
diff --git a/source3/librpc/gen_ndr/cli_eventlog.h b/source3/librpc/gen_ndr/cli_eventlog.h
index 10790a21fc..6945683340 100644
--- a/source3/librpc/gen_ndr/cli_eventlog.h
+++ b/source3/librpc/gen_ndr/cli_eventlog.h
@@ -3,46 +3,46 @@
 #define __CLI_EVENTLOG__
 NTSTATUS rpccli_eventlog_ClearEventLogW(struct rpc_pipe_client *cli,
 					TALLOC_CTX *mem_ctx,
-					struct policy_handle *handle,
-					struct lsa_String *backupfile);
+					struct policy_handle *handle /* [in] [ref] */,
+					struct lsa_String *backupfile /* [in] [unique] */);
 NTSTATUS rpccli_eventlog_BackupEventLogW(struct rpc_pipe_client *cli,
 					 TALLOC_CTX *mem_ctx);
 NTSTATUS rpccli_eventlog_CloseEventLog(struct rpc_pipe_client *cli,
 				       TALLOC_CTX *mem_ctx,
-				       struct policy_handle *handle);
+				       struct policy_handle *handle /* [in,out] [ref] */);
 NTSTATUS rpccli_eventlog_DeregisterEventSource(struct rpc_pipe_client *cli,
 					       TALLOC_CTX *mem_ctx);
 NTSTATUS rpccli_eventlog_GetNumRecords(struct rpc_pipe_client *cli,
 				       TALLOC_CTX *mem_ctx,
-				       struct policy_handle *handle,
-				       uint32_t *number);
+				       struct policy_handle *handle /* [in] [ref] */,
+				       uint32_t *number /* [out] [ref] */);
 NTSTATUS rpccli_eventlog_GetOldestRecord(struct rpc_pipe_client *cli,
 					 TALLOC_CTX *mem_ctx,
-					 struct policy_handle *handle,
-					 uint32_t *oldest_entry);
+					 struct policy_handle *handle /* [in] [ref] */,
+					 uint32_t *oldest_entry /* [out] [ref] */);
 NTSTATUS rpccli_eventlog_ChangeNotify(struct rpc_pipe_client *cli,
 				      TALLOC_CTX *mem_ctx);
 NTSTATUS rpccli_eventlog_OpenEventLogW(struct rpc_pipe_client *cli,
 				       TALLOC_CTX *mem_ctx,
-				       struct eventlog_OpenUnknown0 *unknown0,
-				       struct lsa_String *logname,
-				       struct lsa_String *servername,
-				       uint32_t unknown2,
-				       uint32_t unknown3,
-				       struct policy_handle *handle);
+				       struct eventlog_OpenUnknown0 *unknown0 /* [in] [unique] */,
+				       struct lsa_String *logname /* [in] [ref] */,
+				       struct lsa_String *servername /* [in] [ref] */,
+				       uint32_t unknown2 /* [in]  */,
+				       uint32_t unknown3 /* [in]  */,
+				       struct policy_handle *handle /* [out] [ref] */);
 NTSTATUS rpccli_eventlog_RegisterEventSourceW(struct rpc_pipe_client *cli,
 					      TALLOC_CTX *mem_ctx);
 NTSTATUS rpccli_eventlog_OpenBackupEventLogW(struct rpc_pipe_client *cli,
 					     TALLOC_CTX *mem_ctx);
 NTSTATUS rpccli_eventlog_ReadEventLogW(struct rpc_pipe_client *cli,
 				       TALLOC_CTX *mem_ctx,
-				       struct policy_handle *handle,
-				       uint32_t flags,
-				       uint32_t offset,
-				       uint32_t number_of_bytes,
-				       uint8_t *data,
-				       uint32_t *sent_size,
-				       uint32_t *real_size);
+				       struct policy_handle *handle /* [in] [ref] */,
+				       uint32_t flags /* [in]  */,
+				       uint32_t offset /* [in]  */,
+				       uint32_t number_of_bytes /* [in] [range(0,0x7FFFF)] */,
+				       uint8_t *data /* [out] [ref,size_is(number_of_bytes)] */,
+				       uint32_t *sent_size /* [out] [ref] */,
+				       uint32_t *real_size /* [out] [ref] */);
 NTSTATUS rpccli_eventlog_ReportEventW(struct rpc_pipe_client *cli,
 				      TALLOC_CTX *mem_ctx);
 NTSTATUS rpccli_eventlog_ClearEventLogA(struct rpc_pipe_client *cli,
@@ -69,5 +69,5 @@ NTSTATUS rpccli_eventlog_GetLogIntormation(struct rpc_pipe_client *cli,
 					   TALLOC_CTX *mem_ctx);
 NTSTATUS rpccli_eventlog_FlushEventLog(struct rpc_pipe_client *cli,
 				       TALLOC_CTX *mem_ctx,
-				       struct policy_handle *handle);
+				       struct policy_handle *handle /* [in] [ref] */);
 #endif /* __CLI_EVENTLOG__ */
diff --git a/source3/librpc/gen_ndr/cli_initshutdown.c b/source3/librpc/gen_ndr/cli_initshutdown.c
index 10f5c308d5..da3ea19672 100644
--- a/source3/librpc/gen_ndr/cli_initshutdown.c
+++ b/source3/librpc/gen_ndr/cli_initshutdown.c
@@ -8,11 +8,11 @@
 
 NTSTATUS rpccli_initshutdown_Init(struct rpc_pipe_client *cli,
 				  TALLOC_CTX *mem_ctx,
-				  uint16_t *hostname,
-				  struct initshutdown_String *message,
-				  uint32_t timeout,
-				  uint8_t force_apps,
-				  uint8_t reboot,
+				  uint16_t *hostname /* [in] [unique] */,
+				  struct initshutdown_String *message /* [in] [unique] */,
+				  uint32_t timeout /* [in]  */,
+				  uint8_t force_apps /* [in]  */,
+				  uint8_t reboot /* [in]  */,
 				  WERROR *werror)
 {
 	struct initshutdown_Init r;
@@ -60,7 +60,7 @@ NTSTATUS rpccli_initshutdown_Init(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_initshutdown_Abort(struct rpc_pipe_client *cli,
 				   TALLOC_CTX *mem_ctx,
-				   uint16_t *server,
+				   uint16_t *server /* [in] [unique] */,
 				   WERROR *werror)
 {
 	struct initshutdown_Abort r;
@@ -104,12 +104,12 @@ NTSTATUS rpccli_initshutdown_Abort(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_initshutdown_InitEx(struct rpc_pipe_client *cli,
 				    TALLOC_CTX *mem_ctx,
-				    uint16_t *hostname,
-				    struct initshutdown_String *message,
-				    uint32_t timeout,
-				    uint8_t force_apps,
-				    uint8_t reboot,
-				    uint32_t reason,
+				    uint16_t *hostname /* [in] [unique] */,
+				    struct initshutdown_String *message /* [in] [unique] */,
+				    uint32_t timeout /* [in]  */,
+				    uint8_t force_apps /* [in]  */,
+				    uint8_t reboot /* [in]  */,
+				    uint32_t reason /* [in]  */,
 				    WERROR *werror)
 {
 	struct initshutdown_InitEx r;
diff --git a/source3/librpc/gen_ndr/cli_initshutdown.h b/source3/librpc/gen_ndr/cli_initshutdown.h
index 624b79f94c..4223a35cfa 100644
--- a/source3/librpc/gen_ndr/cli_initshutdown.h
+++ b/source3/librpc/gen_ndr/cli_initshutdown.h
@@ -3,23 +3,23 @@
 #define __CLI_INITSHUTDOWN__
 NTSTATUS rpccli_initshutdown_Init(struct rpc_pipe_client *cli,
 				  TALLOC_CTX *mem_ctx,
-				  uint16_t *hostname,
-				  struct initshutdown_String *message,
-				  uint32_t timeout,
-				  uint8_t force_apps,
-				  uint8_t reboot,
+				  uint16_t *hostname /* [in] [unique] */,
+				  struct initshutdown_String *message /* [in] [unique] */,
+				  uint32_t timeout /* [in]  */,
+				  uint8_t force_apps /* [in]  */,
+				  uint8_t reboot /* [in]  */,
 				  WERROR *werror);
 NTSTATUS rpccli_initshutdown_Abort(struct rpc_pipe_client *cli,
 				   TALLOC_CTX *mem_ctx,
-				   uint16_t *server,
+				   uint16_t *server /* [in] [unique] */,
 				   WERROR *werror);
 NTSTATUS rpccli_initshutdown_InitEx(struct rpc_pipe_client *cli,
 				    TALLOC_CTX *mem_ctx,
-				    uint16_t *hostname,
-				    struct initshutdown_String *message,
-				    uint32_t timeout,
-				    uint8_t force_apps,
-				    uint8_t reboot,
-				    uint32_t reason,
+				    uint16_t *hostname /* [in] [unique] */,
+				    struct initshutdown_String *message /* [in] [unique] */,
+				    uint32_t timeout /* [in]  */,
+				    uint8_t force_apps /* [in]  */,
+				    uint8_t reboot /* [in]  */,
+				    uint32_t reason /* [in]  */,
 				    WERROR *werror);
 #endif /* __CLI_INITSHUTDOWN__ */
diff --git a/source3/librpc/gen_ndr/cli_lsa.c b/source3/librpc/gen_ndr/cli_lsa.c
index b1609ea97b..2b673054dc 100644
--- a/source3/librpc/gen_ndr/cli_lsa.c
+++ b/source3/librpc/gen_ndr/cli_lsa.c
@@ -8,7 +8,7 @@
 
 NTSTATUS rpccli_lsa_Close(struct rpc_pipe_client *cli,
 			  TALLOC_CTX *mem_ctx,
-			  struct policy_handle *handle)
+			  struct policy_handle *handle /* [in,out] [ref] */)
 {
 	struct lsa_Close r;
 	NTSTATUS status;
@@ -48,7 +48,7 @@ NTSTATUS rpccli_lsa_Close(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_lsa_Delete(struct rpc_pipe_client *cli,
 			   TALLOC_CTX *mem_ctx,
-			   struct policy_handle *handle)
+			   struct policy_handle *handle /* [in] [ref] */)
 {
 	struct lsa_Delete r;
 	NTSTATUS status;
@@ -87,10 +87,10 @@ NTSTATUS rpccli_lsa_Delete(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_lsa_EnumPrivs(struct rpc_pipe_client *cli,
 			      TALLOC_CTX *mem_ctx,
-			      struct policy_handle *handle,
-			      uint32_t *resume_handle,
-			      struct lsa_PrivArray *privs,
-			      uint32_t max_count)
+			      struct policy_handle *handle /* [in] [ref] */,
+			      uint32_t *resume_handle /* [in,out] [ref] */,
+			      struct lsa_PrivArray *privs /* [out] [ref] */,
+			      uint32_t max_count /* [in]  */)
 {
 	struct lsa_EnumPrivs r;
 	NTSTATUS status;
@@ -133,9 +133,9 @@ NTSTATUS rpccli_lsa_EnumPrivs(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_lsa_QuerySecurity(struct rpc_pipe_client *cli,
 				  TALLOC_CTX *mem_ctx,
-				  struct policy_handle *handle,
-				  uint32_t sec_info,
-				  struct sec_desc_buf **sdbuf)
+				  struct policy_handle *handle /* [in] [ref] */,
+				  uint32_t sec_info /* [in]  */,
+				  struct sec_desc_buf **sdbuf /* [out] [ref] */)
 {
 	struct lsa_QuerySecurity r;
 	NTSTATUS status;
@@ -176,9 +176,9 @@ NTSTATUS rpccli_lsa_QuerySecurity(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_lsa_SetSecObj(struct rpc_pipe_client *cli,
 			      TALLOC_CTX *mem_ctx,
-			      struct policy_handle *handle,
-			      uint32_t sec_info,
-			      struct sec_desc_buf *sdbuf)
+			      struct policy_handle *handle /* [in] [ref] */,
+			      uint32_t sec_info /* [in]  */,
+			      struct sec_desc_buf *sdbuf /* [in] [ref] */)
 {
 	struct lsa_SetSecObj r;
 	NTSTATUS status;
@@ -256,10 +256,10 @@ NTSTATUS rpccli_lsa_ChangePassword(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_lsa_OpenPolicy(struct rpc_pipe_client *cli,
 			       TALLOC_CTX *mem_ctx,
-			       uint16_t *system_name,
-			       struct lsa_ObjectAttribute *attr,
-			       uint32_t access_mask,
-			       struct policy_handle *handle)
+			       uint16_t *system_name /* [in] [unique] */,
+			       struct lsa_ObjectAttribute *attr /* [in] [ref] */,
+			       uint32_t access_mask /* [in]  */,
+			       struct policy_handle *handle /* [out] [ref] */)
 {
 	struct lsa_OpenPolicy r;
 	NTSTATUS status;
@@ -301,9 +301,9 @@ NTSTATUS rpccli_lsa_OpenPolicy(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_lsa_QueryInfoPolicy(struct rpc_pipe_client *cli,
 				    TALLOC_CTX *mem_ctx,
-				    struct policy_handle *handle,
-				    enum lsa_PolicyInfo level,
-				    union lsa_PolicyInformation **info)
+				    struct policy_handle *handle /* [in] [ref] */,
+				    enum lsa_PolicyInfo level /* [in]  */,
+				    union lsa_PolicyInformation **info /* [out] [ref,switch_is(level)] */)
 {
 	struct lsa_QueryInfoPolicy r;
 	NTSTATUS status;
@@ -344,9 +344,9 @@ NTSTATUS rpccli_lsa_QueryInfoPolicy(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_lsa_SetInfoPolicy(struct rpc_pipe_client *cli,
 				  TALLOC_CTX *mem_ctx,
-				  struct policy_handle *handle,
-				  enum lsa_PolicyInfo level,
-				  union lsa_PolicyInformation *info)
+				  struct policy_handle *handle /* [in] [ref] */,
+				  enum lsa_PolicyInfo level /* [in]  */,
+				  union lsa_PolicyInformation *info /* [in] [ref,switch_is(level)] */)
 {
 	struct lsa_SetInfoPolicy r;
 	NTSTATUS status;
@@ -424,10 +424,10 @@ NTSTATUS rpccli_lsa_ClearAuditLog(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_lsa_CreateAccount(struct rpc_pipe_client *cli,
 				  TALLOC_CTX *mem_ctx,
-				  struct policy_handle *handle,
-				  struct dom_sid2 *sid,
-				  uint32_t access_mask,
-				  struct policy_handle *acct_handle)
+				  struct policy_handle *handle /* [in] [ref] */,
+				  struct dom_sid2 *sid /* [in] [ref] */,
+				  uint32_t access_mask /* [in]  */,
+				  struct policy_handle *acct_handle /* [out] [ref] */)
 {
 	struct lsa_CreateAccount r;
 	NTSTATUS status;
@@ -469,10 +469,10 @@ NTSTATUS rpccli_lsa_CreateAccount(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_lsa_EnumAccounts(struct rpc_pipe_client *cli,
 				 TALLOC_CTX *mem_ctx,
-				 struct policy_handle *handle,
-				 uint32_t *resume_handle,
-				 struct lsa_SidArray *sids,
-				 uint32_t num_entries)
+				 struct policy_handle *handle /* [in] [ref] */,
+				 uint32_t *resume_handle /* [in,out] [ref] */,
+				 struct lsa_SidArray *sids /* [out] [ref] */,
+				 uint32_t num_entries /* [in] [range(0,8192)] */)
 {
 	struct lsa_EnumAccounts r;
 	NTSTATUS status;
@@ -515,10 +515,10 @@ NTSTATUS rpccli_lsa_EnumAccounts(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_lsa_CreateTrustedDomain(struct rpc_pipe_client *cli,
 					TALLOC_CTX *mem_ctx,
-					struct policy_handle *handle,
-					struct lsa_DomainInfo *info,
-					uint32_t access_mask,
-					struct policy_handle *trustdom_handle)
+					struct policy_handle *handle /* [in] [ref] */,
+					struct lsa_DomainInfo *info /* [in] [ref] */,
+					uint32_t access_mask /* [in]  */,
+					struct policy_handle *trustdom_handle /* [out] [ref] */)
 {
 	struct lsa_CreateTrustedDomain r;
 	NTSTATUS status;
@@ -560,10 +560,10 @@ NTSTATUS rpccli_lsa_CreateTrustedDomain(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_lsa_EnumTrustDom(struct rpc_pipe_client *cli,
 				 TALLOC_CTX *mem_ctx,
-				 struct policy_handle *handle,
-				 uint32_t *resume_handle,
-				 struct lsa_DomainList *domains,
-				 uint32_t max_size)
+				 struct policy_handle *handle /* [in] [ref] */,
+				 uint32_t *resume_handle /* [in,out] [ref] */,
+				 struct lsa_DomainList *domains /* [out] [ref] */,
+				 uint32_t max_size /* [in]  */)
 {
 	struct lsa_EnumTrustDom r;
 	NTSTATUS status;
@@ -606,13 +606,13 @@ NTSTATUS rpccli_lsa_EnumTrustDom(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_lsa_LookupNames(struct rpc_pipe_client *cli,
 				TALLOC_CTX *mem_ctx,
-				struct policy_handle *handle,
-				uint32_t num_names,
-				struct lsa_String *names,
-				struct lsa_RefDomainList **domains,
-				struct lsa_TransSidArray *sids,
-				enum lsa_LookupNamesLevel level,
-				uint32_t *count)
+				struct policy_handle *handle /* [in] [ref] */,
+				uint32_t num_names /* [in] [range(0,1000)] */,
+				struct lsa_String *names /* [in] [size_is(num_names)] */,
+				struct lsa_RefDomainList **domains /* [out] [ref] */,
+				struct lsa_TransSidArray *sids /* [in,out] [ref] */,
+				enum lsa_LookupNamesLevel level /* [in]  */,
+				uint32_t *count /* [in,out] [ref] */)
 {
 	struct lsa_LookupNames r;
 	NTSTATUS status;
@@ -659,12 +659,12 @@ NTSTATUS rpccli_lsa_LookupNames(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_lsa_LookupSids(struct rpc_pipe_client *cli,
 			       TALLOC_CTX *mem_ctx,
-			       struct policy_handle *handle,
-			       struct lsa_SidArray *sids,
-			       struct lsa_RefDomainList **domains,
-			       struct lsa_TransNameArray *names,
-			       uint16_t level,
-			       uint32_t *count)
+			       struct policy_handle *handle /* [in] [ref] */,
+			       struct lsa_SidArray *sids /* [in] [ref] */,
+			       struct lsa_RefDomainList **domains /* [out] [ref] */,
+			       struct lsa_TransNameArray *names /* [in,out] [ref] */,
+			       uint16_t level /* [in]  */,
+			       uint32_t *count /* [in,out] [ref] */)
 {
 	struct lsa_LookupSids r;
 	NTSTATUS status;
@@ -710,10 +710,10 @@ NTSTATUS rpccli_lsa_LookupSids(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_lsa_CreateSecret(struct rpc_pipe_client *cli,
 				 TALLOC_CTX *mem_ctx,
-				 struct policy_handle *handle,
-				 struct lsa_String name,
-				 uint32_t access_mask,
-				 struct policy_handle *sec_handle)
+				 struct policy_handle *handle /* [in] [ref] */,
+				 struct lsa_String name /* [in]  */,
+				 uint32_t access_mask /* [in]  */,
+				 struct policy_handle *sec_handle /* [out] [ref] */)
 {
 	struct lsa_CreateSecret r;
 	NTSTATUS status;
@@ -755,10 +755,10 @@ NTSTATUS rpccli_lsa_CreateSecret(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_lsa_OpenAccount(struct rpc_pipe_client *cli,
 				TALLOC_CTX *mem_ctx,
-				struct policy_handle *handle,
-				struct dom_sid2 *sid,
-				uint32_t access_mask,
-				struct policy_handle *acct_handle)
+				struct policy_handle *handle /* [in] [ref] */,
+				struct dom_sid2 *sid /* [in] [ref] */,
+				uint32_t access_mask /* [in]  */,
+				struct policy_handle *acct_handle /* [out] [ref] */)
 {
 	struct lsa_OpenAccount r;
 	NTSTATUS status;
@@ -800,8 +800,8 @@ NTSTATUS rpccli_lsa_OpenAccount(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_lsa_EnumPrivsAccount(struct rpc_pipe_client *cli,
 				     TALLOC_CTX *mem_ctx,
-				     struct policy_handle *handle,
-				     struct lsa_PrivilegeSet **privs)
+				     struct policy_handle *handle /* [in] [ref] */,
+				     struct lsa_PrivilegeSet **privs /* [out] [ref] */)
 {
 	struct lsa_EnumPrivsAccount r;
 	NTSTATUS status;
@@ -841,8 +841,8 @@ NTSTATUS rpccli_lsa_EnumPrivsAccount(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_lsa_AddPrivilegesToAccount(struct rpc_pipe_client *cli,
 					   TALLOC_CTX *mem_ctx,
-					   struct policy_handle *handle,
-					   struct lsa_PrivilegeSet *privs)
+					   struct policy_handle *handle /* [in] [ref] */,
+					   struct lsa_PrivilegeSet *privs /* [in] [ref] */)
 {
 	struct lsa_AddPrivilegesToAccount r;
 	NTSTATUS status;
@@ -882,9 +882,9 @@ NTSTATUS rpccli_lsa_AddPrivilegesToAccount(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_lsa_RemovePrivilegesFromAccount(struct rpc_pipe_client *cli,
 						TALLOC_CTX *mem_ctx,
-						struct policy_handle *handle,
-						uint8_t remove_all,
-						struct lsa_PrivilegeSet *privs)
+						struct policy_handle *handle /* [in] [ref] */,
+						uint8_t remove_all /* [in]  */,
+						struct lsa_PrivilegeSet *privs /* [in] [unique] */)
 {
 	struct lsa_RemovePrivilegesFromAccount r;
 	NTSTATUS status;
@@ -999,8 +999,8 @@ NTSTATUS rpccli_lsa_SetQuotasForAccount(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_lsa_GetSystemAccessAccount(struct rpc_pipe_client *cli,
 					   TALLOC_CTX *mem_ctx,
-					   struct policy_handle *handle,
-					   uint32_t *access_mask)
+					   struct policy_handle *handle /* [in] [ref] */,
+					   uint32_t *access_mask /* [out] [ref] */)
 {
 	struct lsa_GetSystemAccessAccount r;
 	NTSTATUS status;
@@ -1040,8 +1040,8 @@ NTSTATUS rpccli_lsa_GetSystemAccessAccount(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_lsa_SetSystemAccessAccount(struct rpc_pipe_client *cli,
 					   TALLOC_CTX *mem_ctx,
-					   struct policy_handle *handle,
-					   uint32_t access_mask)
+					   struct policy_handle *handle /* [in] [ref] */,
+					   uint32_t access_mask /* [in]  */)
 {
 	struct lsa_SetSystemAccessAccount r;
 	NTSTATUS status;
@@ -1081,10 +1081,10 @@ NTSTATUS rpccli_lsa_SetSystemAccessAccount(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_lsa_OpenTrustedDomain(struct rpc_pipe_client *cli,
 				      TALLOC_CTX *mem_ctx,
-				      struct policy_handle *handle,
-				      struct dom_sid2 *sid,
-				      uint32_t access_mask,
-				      struct policy_handle *trustdom_handle)
+				      struct policy_handle *handle /* [in] [ref] */,
+				      struct dom_sid2 *sid /* [in] [ref] */,
+				      uint32_t access_mask /* [in]  */,
+				      struct policy_handle *trustdom_handle /* [out] [ref] */)
 {
 	struct lsa_OpenTrustedDomain r;
 	NTSTATUS status;
@@ -1126,9 +1126,9 @@ NTSTATUS rpccli_lsa_OpenTrustedDomain(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_lsa_QueryTrustedDomainInfo(struct rpc_pipe_client *cli,
 					   TALLOC_CTX *mem_ctx,
-					   struct policy_handle *trustdom_handle,
-					   enum lsa_TrustDomInfoEnum level,
-					   union lsa_TrustedDomainInfo *info)
+					   struct policy_handle *trustdom_handle /* [in] [ref] */,
+					   enum lsa_TrustDomInfoEnum level /* [in]  */,
+					   union lsa_TrustedDomainInfo *info /* [out] [unique,switch_is(level)] */)
 {
 	struct lsa_QueryTrustedDomainInfo r;
 	NTSTATUS status;
@@ -1208,10 +1208,10 @@ NTSTATUS rpccli_lsa_SetInformationTrustedDomain(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_lsa_OpenSecret(struct rpc_pipe_client *cli,
 			       TALLOC_CTX *mem_ctx,
-			       struct policy_handle *handle,
-			       struct lsa_String name,
-			       uint32_t access_mask,
-			       struct policy_handle *sec_handle)
+			       struct policy_handle *handle /* [in] [ref] */,
+			       struct lsa_String name /* [in]  */,
+			       uint32_t access_mask /* [in]  */,
+			       struct policy_handle *sec_handle /* [out] [ref] */)
 {
 	struct lsa_OpenSecret r;
 	NTSTATUS status;
@@ -1253,9 +1253,9 @@ NTSTATUS rpccli_lsa_OpenSecret(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_lsa_SetSecret(struct rpc_pipe_client *cli,
 			      TALLOC_CTX *mem_ctx,
-			      struct policy_handle *sec_handle,
-			      struct lsa_DATA_BUF *new_val,
-			      struct lsa_DATA_BUF *old_val)
+			      struct policy_handle *sec_handle /* [in] [ref] */,
+			      struct lsa_DATA_BUF *new_val /* [in] [unique] */,
+			      struct lsa_DATA_BUF *old_val /* [in] [unique] */)
 {
 	struct lsa_SetSecret r;
 	NTSTATUS status;
@@ -1296,11 +1296,11 @@ NTSTATUS rpccli_lsa_SetSecret(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_lsa_QuerySecret(struct rpc_pipe_client *cli,
 				TALLOC_CTX *mem_ctx,
-				struct policy_handle *sec_handle,
-				struct lsa_DATA_BUF_PTR *new_val,
-				NTTIME *new_mtime,
-				struct lsa_DATA_BUF_PTR *old_val,
-				NTTIME *old_mtime)
+				struct policy_handle *sec_handle /* [in] [ref] */,
+				struct lsa_DATA_BUF_PTR *new_val /* [in,out] [unique] */,
+				NTTIME *new_mtime /* [in,out] [unique] */,
+				struct lsa_DATA_BUF_PTR *old_val /* [in,out] [unique] */,
+				NTTIME *old_mtime /* [in,out] [unique] */)
 {
 	struct lsa_QuerySecret r;
 	NTSTATUS status;
@@ -1355,9 +1355,9 @@ NTSTATUS rpccli_lsa_QuerySecret(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_lsa_LookupPrivValue(struct rpc_pipe_client *cli,
 				    TALLOC_CTX *mem_ctx,
-				    struct policy_handle *handle,
-				    struct lsa_String *name,
-				    struct lsa_LUID *luid)
+				    struct policy_handle *handle /* [in] [ref] */,
+				    struct lsa_String *name /* [in] [ref] */,
+				    struct lsa_LUID *luid /* [out] [ref] */)
 {
 	struct lsa_LookupPrivValue r;
 	NTSTATUS status;
@@ -1398,9 +1398,9 @@ NTSTATUS rpccli_lsa_LookupPrivValue(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_lsa_LookupPrivName(struct rpc_pipe_client *cli,
 				   TALLOC_CTX *mem_ctx,
-				   struct policy_handle *handle,
-				   struct lsa_LUID *luid,
-				   struct lsa_StringLarge *name)
+				   struct policy_handle *handle /* [in] [ref] */,
+				   struct lsa_LUID *luid /* [in] [ref] */,
+				   struct lsa_StringLarge *name /* [out] [unique] */)
 {
 	struct lsa_LookupPrivName r;
 	NTSTATUS status;
@@ -1443,12 +1443,12 @@ NTSTATUS rpccli_lsa_LookupPrivName(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_lsa_LookupPrivDisplayName(struct rpc_pipe_client *cli,
 					  TALLOC_CTX *mem_ctx,
-					  struct policy_handle *handle,
-					  struct lsa_String *name,
-					  uint16_t language_id,
-					  uint16_t language_id_sys,
-					  struct lsa_StringLarge **disp_name,
-					  uint16_t *returned_language_id)
+					  struct policy_handle *handle /* [in] [ref] */,
+					  struct lsa_String *name /* [in] [ref] */,
+					  uint16_t language_id /* [in]  */,
+					  uint16_t language_id_sys /* [in]  */,
+					  struct lsa_StringLarge **disp_name /* [out] [ref] */,
+					  uint16_t *returned_language_id /* [out] [ref] */)
 {
 	struct lsa_LookupPrivDisplayName r;
 	NTSTATUS status;
@@ -1492,7 +1492,7 @@ NTSTATUS rpccli_lsa_LookupPrivDisplayName(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_lsa_DeleteObject(struct rpc_pipe_client *cli,
 				 TALLOC_CTX *mem_ctx,
-				 struct policy_handle *handle)
+				 struct policy_handle *handle /* [in,out] [ref] */)
 {
 	struct lsa_DeleteObject r;
 	NTSTATUS status;
@@ -1532,9 +1532,9 @@ NTSTATUS rpccli_lsa_DeleteObject(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_lsa_EnumAccountsWithUserRight(struct rpc_pipe_client *cli,
 					      TALLOC_CTX *mem_ctx,
-					      struct policy_handle *handle,
-					      struct lsa_String *name,
-					      struct lsa_SidArray *sids)
+					      struct policy_handle *handle /* [in] [ref] */,
+					      struct lsa_String *name /* [in] [unique] */,
+					      struct lsa_SidArray *sids /* [out] [ref] */)
 {
 	struct lsa_EnumAccountsWithUserRight r;
 	NTSTATUS status;
@@ -1575,9 +1575,9 @@ NTSTATUS rpccli_lsa_EnumAccountsWithUserRight(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_lsa_EnumAccountRights(struct rpc_pipe_client *cli,
 				      TALLOC_CTX *mem_ctx,
-				      struct policy_handle *handle,
-				      struct dom_sid2 *sid,
-				      struct lsa_RightSet *rights)
+				      struct policy_handle *handle /* [in] [ref] */,
+				      struct dom_sid2 *sid /* [in] [ref] */,
+				      struct lsa_RightSet *rights /* [out] [ref] */)
 {
 	struct lsa_EnumAccountRights r;
 	NTSTATUS status;
@@ -1618,9 +1618,9 @@ NTSTATUS rpccli_lsa_EnumAccountRights(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_lsa_AddAccountRights(struct rpc_pipe_client *cli,
 				     TALLOC_CTX *mem_ctx,
-				     struct policy_handle *handle,
-				     struct dom_sid2 *sid,
-				     struct lsa_RightSet *rights)
+				     struct policy_handle *handle /* [in] [ref] */,
+				     struct dom_sid2 *sid /* [in] [ref] */,
+				     struct lsa_RightSet *rights /* [in] [ref] */)
 {
 	struct lsa_AddAccountRights r;
 	NTSTATUS status;
@@ -1661,10 +1661,10 @@ NTSTATUS rpccli_lsa_AddAccountRights(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_lsa_RemoveAccountRights(struct rpc_pipe_client *cli,
 					TALLOC_CTX *mem_ctx,
-					struct policy_handle *handle,
-					struct dom_sid2 *sid,
-					uint8_t remove_all,
-					struct lsa_RightSet *rights)
+					struct policy_handle *handle /* [in] [ref] */,
+					struct dom_sid2 *sid /* [in] [ref] */,
+					uint8_t remove_all /* [in]  */,
+					struct lsa_RightSet *rights /* [in] [ref] */)
 {
 	struct lsa_RemoveAccountRights r;
 	NTSTATUS status;
@@ -1706,10 +1706,10 @@ NTSTATUS rpccli_lsa_RemoveAccountRights(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_lsa_QueryTrustedDomainInfoBySid(struct rpc_pipe_client *cli,
 						TALLOC_CTX *mem_ctx,
-						struct policy_handle *handle,
-						struct dom_sid2 *dom_sid,
-						enum lsa_TrustDomInfoEnum level,
-						union lsa_TrustedDomainInfo *info)
+						struct policy_handle *handle /* [in] [ref] */,
+						struct dom_sid2 *dom_sid /* [in] [ref] */,
+						enum lsa_TrustDomInfoEnum level /* [in]  */,
+						union lsa_TrustedDomainInfo *info /* [out] [unique,switch_is(level)] */)
 {
 	struct lsa_QueryTrustedDomainInfoBySid r;
 	NTSTATUS status;
@@ -1790,8 +1790,8 @@ NTSTATUS rpccli_lsa_SetTrustedDomainInfo(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_lsa_DeleteTrustedDomain(struct rpc_pipe_client *cli,
 					TALLOC_CTX *mem_ctx,
-					struct policy_handle *handle,
-					struct dom_sid2 *dom_sid)
+					struct policy_handle *handle /* [in] [ref] */,
+					struct dom_sid2 *dom_sid /* [in] [ref] */)
 {
 	struct lsa_DeleteTrustedDomain r;
 	NTSTATUS status;
@@ -1905,10 +1905,10 @@ NTSTATUS rpccli_lsa_RetrievePrivateData(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_lsa_OpenPolicy2(struct rpc_pipe_client *cli,
 				TALLOC_CTX *mem_ctx,
-				const char *system_name,
-				struct lsa_ObjectAttribute *attr,
-				uint32_t access_mask,
-				struct policy_handle *handle)
+				const char *system_name /* [in] [unique,charset(UTF16)] */,
+				struct lsa_ObjectAttribute *attr /* [in] [ref] */,
+				uint32_t access_mask /* [in]  */,
+				struct policy_handle *handle /* [out] [ref] */)
 {
 	struct lsa_OpenPolicy2 r;
 	NTSTATUS status;
@@ -1950,9 +1950,9 @@ NTSTATUS rpccli_lsa_OpenPolicy2(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_lsa_GetUserName(struct rpc_pipe_client *cli,
 				TALLOC_CTX *mem_ctx,
-				const char *system_name,
-				struct lsa_String **account_name,
-				struct lsa_String **authority_name)
+				const char *system_name /* [in] [unique,charset(UTF16)] */,
+				struct lsa_String **account_name /* [in,out] [ref] */,
+				struct lsa_String **authority_name /* [in,out] [unique] */)
 {
 	struct lsa_GetUserName r;
 	NTSTATUS status;
@@ -1997,9 +1997,9 @@ NTSTATUS rpccli_lsa_GetUserName(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_lsa_QueryInfoPolicy2(struct rpc_pipe_client *cli,
 				     TALLOC_CTX *mem_ctx,
-				     struct policy_handle *handle,
-				     enum lsa_PolicyInfo level,
-				     union lsa_PolicyInformation **info)
+				     struct policy_handle *handle /* [in] [ref] */,
+				     enum lsa_PolicyInfo level /* [in]  */,
+				     union lsa_PolicyInformation **info /* [out] [ref,switch_is(level)] */)
 {
 	struct lsa_QueryInfoPolicy2 r;
 	NTSTATUS status;
@@ -2040,9 +2040,9 @@ NTSTATUS rpccli_lsa_QueryInfoPolicy2(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_lsa_SetInfoPolicy2(struct rpc_pipe_client *cli,
 				   TALLOC_CTX *mem_ctx,
-				   struct policy_handle *handle,
-				   enum lsa_PolicyInfo level,
-				   union lsa_PolicyInformation *info)
+				   struct policy_handle *handle /* [in] [ref] */,
+				   enum lsa_PolicyInfo level /* [in]  */,
+				   union lsa_PolicyInformation *info /* [in] [ref,switch_is(level)] */)
 {
 	struct lsa_SetInfoPolicy2 r;
 	NTSTATUS status;
@@ -2083,10 +2083,10 @@ NTSTATUS rpccli_lsa_SetInfoPolicy2(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_lsa_QueryTrustedDomainInfoByName(struct rpc_pipe_client *cli,
 						 TALLOC_CTX *mem_ctx,
-						 struct policy_handle *handle,
-						 struct lsa_String *trusted_domain,
-						 enum lsa_TrustDomInfoEnum level,
-						 union lsa_TrustedDomainInfo *info)
+						 struct policy_handle *handle /* [in] [ref] */,
+						 struct lsa_String *trusted_domain /* [in] [ref] */,
+						 enum lsa_TrustDomInfoEnum level /* [in]  */,
+						 union lsa_TrustedDomainInfo *info /* [out] [ref,switch_is(level)] */)
 {
 	struct lsa_QueryTrustedDomainInfoByName r;
 	NTSTATUS status;
@@ -2128,10 +2128,10 @@ NTSTATUS rpccli_lsa_QueryTrustedDomainInfoByName(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_lsa_SetTrustedDomainInfoByName(struct rpc_pipe_client *cli,
 					       TALLOC_CTX *mem_ctx,
-					       struct policy_handle *handle,
-					       struct lsa_String trusted_domain,
-					       enum lsa_TrustDomInfoEnum level,
-					       union lsa_TrustedDomainInfo *info)
+					       struct policy_handle *handle /* [in] [ref] */,
+					       struct lsa_String trusted_domain /* [in]  */,
+					       enum lsa_TrustDomInfoEnum level /* [in]  */,
+					       union lsa_TrustedDomainInfo *info /* [in] [unique,switch_is(level)] */)
 {
 	struct lsa_SetTrustedDomainInfoByName r;
 	NTSTATUS status;
@@ -2173,10 +2173,10 @@ NTSTATUS rpccli_lsa_SetTrustedDomainInfoByName(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_lsa_EnumTrustedDomainsEx(struct rpc_pipe_client *cli,
 					 TALLOC_CTX *mem_ctx,
-					 struct policy_handle *handle,
-					 uint32_t *resume_handle,
-					 struct lsa_DomainListEx *domains,
-					 uint32_t max_size)
+					 struct policy_handle *handle /* [in] [ref] */,
+					 uint32_t *resume_handle /* [in,out] [ref] */,
+					 struct lsa_DomainListEx *domains /* [out] [ref] */,
+					 uint32_t max_size /* [in]  */)
 {
 	struct lsa_EnumTrustedDomainsEx r;
 	NTSTATUS status;
@@ -2256,7 +2256,7 @@ NTSTATUS rpccli_lsa_CreateTrustedDomainEx(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_lsa_CloseTrustedDomainEx(struct rpc_pipe_client *cli,
 					 TALLOC_CTX *mem_ctx,
-					 struct policy_handle *handle)
+					 struct policy_handle *handle /* [in,out] [ref] */)
 {
 	struct lsa_CloseTrustedDomainEx r;
 	NTSTATUS status;
@@ -2296,9 +2296,9 @@ NTSTATUS rpccli_lsa_CloseTrustedDomainEx(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_lsa_QueryDomainInformationPolicy(struct rpc_pipe_client *cli,
 						 TALLOC_CTX *mem_ctx,
-						 struct policy_handle *handle,
-						 uint16_t level,
-						 union lsa_DomainInformationPolicy *info)
+						 struct policy_handle *handle /* [in] [ref] */,
+						 uint16_t level /* [in]  */,
+						 union lsa_DomainInformationPolicy *info /* [out] [unique,switch_is(level)] */)
 {
 	struct lsa_QueryDomainInformationPolicy r;
 	NTSTATUS status;
@@ -2341,9 +2341,9 @@ NTSTATUS rpccli_lsa_QueryDomainInformationPolicy(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_lsa_SetDomainInformationPolicy(struct rpc_pipe_client *cli,
 					       TALLOC_CTX *mem_ctx,
-					       struct policy_handle *handle,
-					       uint16_t level,
-					       union lsa_DomainInformationPolicy *info)
+					       struct policy_handle *handle /* [in] [ref] */,
+					       uint16_t level /* [in]  */,
+					       union lsa_DomainInformationPolicy *info /* [in] [unique,switch_is(level)] */)
 {
 	struct lsa_SetDomainInformationPolicy r;
 	NTSTATUS status;
@@ -2384,10 +2384,10 @@ NTSTATUS rpccli_lsa_SetDomainInformationPolicy(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_lsa_OpenTrustedDomainByName(struct rpc_pipe_client *cli,
 					    TALLOC_CTX *mem_ctx,
-					    struct policy_handle *handle,
-					    struct lsa_String name,
-					    uint32_t access_mask,
-					    struct policy_handle *trustdom_handle)
+					    struct policy_handle *handle /* [in] [ref] */,
+					    struct lsa_String name /* [in]  */,
+					    uint32_t access_mask /* [in]  */,
+					    struct policy_handle *trustdom_handle /* [out] [ref] */)
 {
 	struct lsa_OpenTrustedDomainByName r;
 	NTSTATUS status;
@@ -2466,14 +2466,14 @@ NTSTATUS rpccli_lsa_TestCall(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_lsa_LookupSids2(struct rpc_pipe_client *cli,
 				TALLOC_CTX *mem_ctx,
-				struct policy_handle *handle,
-				struct lsa_SidArray *sids,
-				struct lsa_RefDomainList **domains,
-				struct lsa_TransNameArray2 *names,
-				uint16_t level,
-				uint32_t *count,
-				uint32_t unknown1,
-				uint32_t unknown2)
+				struct policy_handle *handle /* [in] [ref] */,
+				struct lsa_SidArray *sids /* [in] [ref] */,
+				struct lsa_RefDomainList **domains /* [out] [ref] */,
+				struct lsa_TransNameArray2 *names /* [in,out] [ref] */,
+				uint16_t level /* [in]  */,
+				uint32_t *count /* [in,out] [ref] */,
+				uint32_t unknown1 /* [in]  */,
+				uint32_t unknown2 /* [in]  */)
 {
 	struct lsa_LookupSids2 r;
 	NTSTATUS status;
@@ -2521,15 +2521,15 @@ NTSTATUS rpccli_lsa_LookupSids2(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_lsa_LookupNames2(struct rpc_pipe_client *cli,
 				 TALLOC_CTX *mem_ctx,
-				 struct policy_handle *handle,
-				 uint32_t num_names,
-				 struct lsa_String *names,
-				 struct lsa_RefDomainList **domains,
-				 struct lsa_TransSidArray2 *sids,
-				 enum lsa_LookupNamesLevel level,
-				 uint32_t *count,
-				 uint32_t unknown1,
-				 uint32_t unknown2)
+				 struct policy_handle *handle /* [in] [ref] */,
+				 uint32_t num_names /* [in] [range(0,1000)] */,
+				 struct lsa_String *names /* [in] [size_is(num_names)] */,
+				 struct lsa_RefDomainList **domains /* [out] [ref] */,
+				 struct lsa_TransSidArray2 *sids /* [in,out] [ref] */,
+				 enum lsa_LookupNamesLevel level /* [in]  */,
+				 uint32_t *count /* [in,out] [ref] */,
+				 uint32_t unknown1 /* [in]  */,
+				 uint32_t unknown2 /* [in]  */)
 {
 	struct lsa_LookupNames2 r;
 	NTSTATUS status;
@@ -2911,15 +2911,15 @@ NTSTATUS rpccli_lsa_CREDRPROFILELOADED(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_lsa_LookupNames3(struct rpc_pipe_client *cli,
 				 TALLOC_CTX *mem_ctx,
-				 struct policy_handle *handle,
-				 uint32_t num_names,
-				 struct lsa_String *names,
-				 struct lsa_RefDomainList **domains,
-				 struct lsa_TransSidArray3 *sids,
-				 enum lsa_LookupNamesLevel level,
-				 uint32_t *count,
-				 uint32_t unknown1,
-				 uint32_t unknown2)
+				 struct policy_handle *handle /* [in] [ref] */,
+				 uint32_t num_names /* [in] [range(0,1000)] */,
+				 struct lsa_String *names /* [in] [size_is(num_names)] */,
+				 struct lsa_RefDomainList **domains /* [out] [ref] */,
+				 struct lsa_TransSidArray3 *sids /* [in,out] [ref] */,
+				 enum lsa_LookupNamesLevel level /* [in]  */,
+				 uint32_t *count /* [in,out] [ref] */,
+				 uint32_t unknown1 /* [in]  */,
+				 uint32_t unknown2 /* [in]  */)
 {
 	struct lsa_LookupNames3 r;
 	NTSTATUS status;
@@ -3116,10 +3116,10 @@ NTSTATUS rpccli_lsa_LSARUNREGISTERAUDITEVENT(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_lsa_lsaRQueryForestTrustInformation(struct rpc_pipe_client *cli,
 						    TALLOC_CTX *mem_ctx,
-						    struct policy_handle *handle,
-						    struct lsa_String *trusted_domain_name,
-						    uint16_t unknown,
-						    struct lsa_ForestTrustInformation **forest_trust_info)
+						    struct policy_handle *handle /* [in] [ref] */,
+						    struct lsa_String *trusted_domain_name /* [in] [ref] */,
+						    uint16_t unknown /* [in]  */,
+						    struct lsa_ForestTrustInformation **forest_trust_info /* [out] [ref] */)
 {
 	struct lsa_lsaRQueryForestTrustInformation r;
 	NTSTATUS status;
@@ -3235,13 +3235,13 @@ NTSTATUS rpccli_lsa_CREDRRENAME(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_lsa_LookupSids3(struct rpc_pipe_client *cli,
 				TALLOC_CTX *mem_ctx,
-				struct lsa_SidArray *sids,
-				struct lsa_RefDomainList **domains,
-				struct lsa_TransNameArray2 *names,
-				uint16_t level,
-				uint32_t *count,
-				uint32_t unknown1,
-				uint32_t unknown2)
+				struct lsa_SidArray *sids /* [in] [ref] */,
+				struct lsa_RefDomainList **domains /* [out] [ref] */,
+				struct lsa_TransNameArray2 *names /* [in,out] [ref] */,
+				uint16_t level /* [in]  */,
+				uint32_t *count /* [in,out] [ref] */,
+				uint32_t unknown1 /* [in]  */,
+				uint32_t unknown2 /* [in]  */)
 {
 	struct lsa_LookupSids3 r;
 	NTSTATUS status;
@@ -3288,14 +3288,14 @@ NTSTATUS rpccli_lsa_LookupSids3(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_lsa_LookupNames4(struct rpc_pipe_client *cli,
 				 TALLOC_CTX *mem_ctx,
-				 uint32_t num_names,
-				 struct lsa_String *names,
-				 struct lsa_RefDomainList **domains,
-				 struct lsa_TransSidArray3 *sids,
-				 enum lsa_LookupNamesLevel level,
-				 uint32_t *count,
-				 uint32_t unknown1,
-				 uint32_t unknown2)
+				 uint32_t num_names /* [in] [range(0,1000)] */,
+				 struct lsa_String *names /* [in] [size_is(num_names)] */,
+				 struct lsa_RefDomainList **domains /* [out] [ref] */,
+				 struct lsa_TransSidArray3 *sids /* [in,out] [ref] */,
+				 enum lsa_LookupNamesLevel level /* [in]  */,
+				 uint32_t *count /* [in,out] [ref] */,
+				 uint32_t unknown1 /* [in]  */,
+				 uint32_t unknown2 /* [in]  */)
 {
 	struct lsa_LookupNames4 r;
 	NTSTATUS status;
diff --git a/source3/librpc/gen_ndr/cli_lsa.h b/source3/librpc/gen_ndr/cli_lsa.h
index 7d69926484..aa326cdaba 100644
--- a/source3/librpc/gen_ndr/cli_lsa.h
+++ b/source3/librpc/gen_ndr/cli_lsa.h
@@ -3,296 +3,296 @@
 #define __CLI_LSARPC__
 NTSTATUS rpccli_lsa_Close(struct rpc_pipe_client *cli,
 			  TALLOC_CTX *mem_ctx,
-			  struct policy_handle *handle);
+			  struct policy_handle *handle /* [in,out] [ref] */);
 NTSTATUS rpccli_lsa_Delete(struct rpc_pipe_client *cli,
 			   TALLOC_CTX *mem_ctx,
-			   struct policy_handle *handle);
+			   struct policy_handle *handle /* [in] [ref] */);
 NTSTATUS rpccli_lsa_EnumPrivs(struct rpc_pipe_client *cli,
 			      TALLOC_CTX *mem_ctx,
-			      struct policy_handle *handle,
-			      uint32_t *resume_handle,
-			      struct lsa_PrivArray *privs,
-			      uint32_t max_count);
+			      struct policy_handle *handle /* [in] [ref] */,
+			      uint32_t *resume_handle /* [in,out] [ref] */,
+			      struct lsa_PrivArray *privs /* [out] [ref] */,
+			      uint32_t max_count /* [in]  */);
 NTSTATUS rpccli_lsa_QuerySecurity(struct rpc_pipe_client *cli,
 				  TALLOC_CTX *mem_ctx,
-				  struct policy_handle *handle,
-				  uint32_t sec_info,
-				  struct sec_desc_buf **sdbuf);
+				  struct policy_handle *handle /* [in] [ref] */,
+				  uint32_t sec_info /* [in]  */,
+				  struct sec_desc_buf **sdbuf /* [out] [ref] */);
 NTSTATUS rpccli_lsa_SetSecObj(struct rpc_pipe_client *cli,
 			      TALLOC_CTX *mem_ctx,
-			      struct policy_handle *handle,
-			      uint32_t sec_info,
-			      struct sec_desc_buf *sdbuf);
+			      struct policy_handle *handle /* [in] [ref] */,
+			      uint32_t sec_info /* [in]  */,
+			      struct sec_desc_buf *sdbuf /* [in] [ref] */);
 NTSTATUS rpccli_lsa_ChangePassword(struct rpc_pipe_client *cli,
 				   TALLOC_CTX *mem_ctx);
 NTSTATUS rpccli_lsa_OpenPolicy(struct rpc_pipe_client *cli,
 			       TALLOC_CTX *mem_ctx,
-			       uint16_t *system_name,
-			       struct lsa_ObjectAttribute *attr,
-			       uint32_t access_mask,
-			       struct policy_handle *handle);
+			       uint16_t *system_name /* [in] [unique] */,
+			       struct lsa_ObjectAttribute *attr /* [in] [ref] */,
+			       uint32_t access_mask /* [in]  */,
+			       struct policy_handle *handle /* [out] [ref] */);
 NTSTATUS rpccli_lsa_QueryInfoPolicy(struct rpc_pipe_client *cli,
 				    TALLOC_CTX *mem_ctx,
-				    struct policy_handle *handle,
-				    enum lsa_PolicyInfo level,
-				    union lsa_PolicyInformation **info);
+				    struct policy_handle *handle /* [in] [ref] */,
+				    enum lsa_PolicyInfo level /* [in]  */,
+				    union lsa_PolicyInformation **info /* [out] [ref,switch_is(level)] */);
 NTSTATUS rpccli_lsa_SetInfoPolicy(struct rpc_pipe_client *cli,
 				  TALLOC_CTX *mem_ctx,
-				  struct policy_handle *handle,
-				  enum lsa_PolicyInfo level,
-				  union lsa_PolicyInformation *info);
+				  struct policy_handle *handle /* [in] [ref] */,
+				  enum lsa_PolicyInfo level /* [in]  */,
+				  union lsa_PolicyInformation *info /* [in] [ref,switch_is(level)] */);
 NTSTATUS rpccli_lsa_ClearAuditLog(struct rpc_pipe_client *cli,
 				  TALLOC_CTX *mem_ctx);
 NTSTATUS rpccli_lsa_CreateAccount(struct rpc_pipe_client *cli,
 				  TALLOC_CTX *mem_ctx,
-				  struct policy_handle *handle,
-				  struct dom_sid2 *sid,
-				  uint32_t access_mask,
-				  struct policy_handle *acct_handle);
+				  struct policy_handle *handle /* [in] [ref] */,
+				  struct dom_sid2 *sid /* [in] [ref] */,
+				  uint32_t access_mask /* [in]  */,
+				  struct policy_handle *acct_handle /* [out] [ref] */);
 NTSTATUS rpccli_lsa_EnumAccounts(struct rpc_pipe_client *cli,
 				 TALLOC_CTX *mem_ctx,
-				 struct policy_handle *handle,
-				 uint32_t *resume_handle,
-				 struct lsa_SidArray *sids,
-				 uint32_t num_entries);
+				 struct policy_handle *handle /* [in] [ref] */,
+				 uint32_t *resume_handle /* [in,out] [ref] */,
+				 struct lsa_SidArray *sids /* [out] [ref] */,
+				 uint32_t num_entries /* [in] [range(0,8192)] */);
 NTSTATUS rpccli_lsa_CreateTrustedDomain(struct rpc_pipe_client *cli,
 					TALLOC_CTX *mem_ctx,
-					struct policy_handle *handle,
-					struct lsa_DomainInfo *info,
-					uint32_t access_mask,
-					struct policy_handle *trustdom_handle);
+					struct policy_handle *handle /* [in] [ref] */,
+					struct lsa_DomainInfo *info /* [in] [ref] */,
+					uint32_t access_mask /* [in]  */,
+					struct policy_handle *trustdom_handle /* [out] [ref] */);
 NTSTATUS rpccli_lsa_EnumTrustDom(struct rpc_pipe_client *cli,
 				 TALLOC_CTX *mem_ctx,
-				 struct policy_handle *handle,
-				 uint32_t *resume_handle,
-				 struct lsa_DomainList *domains,
-				 uint32_t max_size);
+				 struct policy_handle *handle /* [in] [ref] */,
+				 uint32_t *resume_handle /* [in,out] [ref] */,
+				 struct lsa_DomainList *domains /* [out] [ref] */,
+				 uint32_t max_size /* [in]  */);
 NTSTATUS rpccli_lsa_LookupNames(struct rpc_pipe_client *cli,
 				TALLOC_CTX *mem_ctx,
-				struct policy_handle *handle,
-				uint32_t num_names,
-				struct lsa_String *names,
-				struct lsa_RefDomainList **domains,
-				struct lsa_TransSidArray *sids,
-				enum lsa_LookupNamesLevel level,
-				uint32_t *count);
+				struct policy_handle *handle /* [in] [ref] */,
+				uint32_t num_names /* [in] [range(0,1000)] */,
+				struct lsa_String *names /* [in] [size_is(num_names)] */,
+				struct lsa_RefDomainList **domains /* [out] [ref] */,
+				struct lsa_TransSidArray *sids /* [in,out] [ref] */,
+				enum lsa_LookupNamesLevel level /* [in]  */,
+				uint32_t *count /* [in,out] [ref] */);
 NTSTATUS rpccli_lsa_LookupSids(struct rpc_pipe_client *cli,
 			       TALLOC_CTX *mem_ctx,
-			       struct policy_handle *handle,
-			       struct lsa_SidArray *sids,
-			       struct lsa_RefDomainList **domains,
-			       struct lsa_TransNameArray *names,
-			       uint16_t level,
-			       uint32_t *count);
+			       struct policy_handle *handle /* [in] [ref] */,
+			       struct lsa_SidArray *sids /* [in] [ref] */,
+			       struct lsa_RefDomainList **domains /* [out] [ref] */,
+			       struct lsa_TransNameArray *names /* [in,out] [ref] */,
+			       uint16_t level /* [in]  */,
+			       uint32_t *count /* [in,out] [ref] */);
 NTSTATUS rpccli_lsa_CreateSecret(struct rpc_pipe_client *cli,
 				 TALLOC_CTX *mem_ctx,
-				 struct policy_handle *handle,
-				 struct lsa_String name,
-				 uint32_t access_mask,
-				 struct policy_handle *sec_handle);
+				 struct policy_handle *handle /* [in] [ref] */,
+				 struct lsa_String name /* [in]  */,
+				 uint32_t access_mask /* [in]  */,
+				 struct policy_handle *sec_handle /* [out] [ref] */);
 NTSTATUS rpccli_lsa_OpenAccount(struct rpc_pipe_client *cli,
 				TALLOC_CTX *mem_ctx,
-				struct policy_handle *handle,
-				struct dom_sid2 *sid,
-				uint32_t access_mask,
-				struct policy_handle *acct_handle);
+				struct policy_handle *handle /* [in] [ref] */,
+				struct dom_sid2 *sid /* [in] [ref] */,
+				uint32_t access_mask /* [in]  */,
+				struct policy_handle *acct_handle /* [out] [ref] */);
 NTSTATUS rpccli_lsa_EnumPrivsAccount(struct rpc_pipe_client *cli,
 				     TALLOC_CTX *mem_ctx,
-				     struct policy_handle *handle,
-				     struct lsa_PrivilegeSet **privs);
+				     struct policy_handle *handle /* [in] [ref] */,
+				     struct lsa_PrivilegeSet **privs /* [out] [ref] */);
 NTSTATUS rpccli_lsa_AddPrivilegesToAccount(struct rpc_pipe_client *cli,
 					   TALLOC_CTX *mem_ctx,
-					   struct policy_handle *handle,
-					   struct lsa_PrivilegeSet *privs);
+					   struct policy_handle *handle /* [in] [ref] */,
+					   struct lsa_PrivilegeSet *privs /* [in] [ref] */);
 NTSTATUS rpccli_lsa_RemovePrivilegesFromAccount(struct rpc_pipe_client *cli,
 						TALLOC_CTX *mem_ctx,
-						struct policy_handle *handle,
-						uint8_t remove_all,
-						struct lsa_PrivilegeSet *privs);
+						struct policy_handle *handle /* [in] [ref] */,
+						uint8_t remove_all /* [in]  */,
+						struct lsa_PrivilegeSet *privs /* [in] [unique] */);
 NTSTATUS rpccli_lsa_GetQuotasForAccount(struct rpc_pipe_client *cli,
 					TALLOC_CTX *mem_ctx);
 NTSTATUS rpccli_lsa_SetQuotasForAccount(struct rpc_pipe_client *cli,
 					TALLOC_CTX *mem_ctx);
 NTSTATUS rpccli_lsa_GetSystemAccessAccount(struct rpc_pipe_client *cli,
 					   TALLOC_CTX *mem_ctx,
-					   struct policy_handle *handle,
-					   uint32_t *access_mask);
+					   struct policy_handle *handle /* [in] [ref] */,
+					   uint32_t *access_mask /* [out] [ref] */);
 NTSTATUS rpccli_lsa_SetSystemAccessAccount(struct rpc_pipe_client *cli,
 					   TALLOC_CTX *mem_ctx,
-					   struct policy_handle *handle,
-					   uint32_t access_mask);
+					   struct policy_handle *handle /* [in] [ref] */,
+					   uint32_t access_mask /* [in]  */);
 NTSTATUS rpccli_lsa_OpenTrustedDomain(struct rpc_pipe_client *cli,
 				      TALLOC_CTX *mem_ctx,
-				      struct policy_handle *handle,
-				      struct dom_sid2 *sid,
-				      uint32_t access_mask,
-				      struct policy_handle *trustdom_handle);
+				      struct policy_handle *handle /* [in] [ref] */,
+				      struct dom_sid2 *sid /* [in] [ref] */,
+				      uint32_t access_mask /* [in]  */,
+				      struct policy_handle *trustdom_handle /* [out] [ref] */);
 NTSTATUS rpccli_lsa_QueryTrustedDomainInfo(struct rpc_pipe_client *cli,
 					   TALLOC_CTX *mem_ctx,
-					   struct policy_handle *trustdom_handle,
-					   enum lsa_TrustDomInfoEnum level,
-					   union lsa_TrustedDomainInfo *info);
+					   struct policy_handle *trustdom_handle /* [in] [ref] */,
+					   enum lsa_TrustDomInfoEnum level /* [in]  */,
+					   union lsa_TrustedDomainInfo *info /* [out] [unique,switch_is(level)] */);
 NTSTATUS rpccli_lsa_SetInformationTrustedDomain(struct rpc_pipe_client *cli,
 						TALLOC_CTX *mem_ctx);
 NTSTATUS rpccli_lsa_OpenSecret(struct rpc_pipe_client *cli,
 			       TALLOC_CTX *mem_ctx,
-			       struct policy_handle *handle,
-			       struct lsa_String name,
-			       uint32_t access_mask,
-			       struct policy_handle *sec_handle);
+			       struct policy_handle *handle /* [in] [ref] */,
+			       struct lsa_String name /* [in]  */,
+			       uint32_t access_mask /* [in]  */,
+			       struct policy_handle *sec_handle /* [out] [ref] */);
 NTSTATUS rpccli_lsa_SetSecret(struct rpc_pipe_client *cli,
 			      TALLOC_CTX *mem_ctx,
-			      struct policy_handle *sec_handle,
-			      struct lsa_DATA_BUF *new_val,
-			      struct lsa_DATA_BUF *old_val);
+			      struct policy_handle *sec_handle /* [in] [ref] */,
+			      struct lsa_DATA_BUF *new_val /* [in] [unique] */,
+			      struct lsa_DATA_BUF *old_val /* [in] [unique] */);
 NTSTATUS rpccli_lsa_QuerySecret(struct rpc_pipe_client *cli,
 				TALLOC_CTX *mem_ctx,
-				struct policy_handle *sec_handle,
-				struct lsa_DATA_BUF_PTR *new_val,
-				NTTIME *new_mtime,
-				struct lsa_DATA_BUF_PTR *old_val,
-				NTTIME *old_mtime);
+				struct policy_handle *sec_handle /* [in] [ref] */,
+				struct lsa_DATA_BUF_PTR *new_val /* [in,out] [unique] */,
+				NTTIME *new_mtime /* [in,out] [unique] */,
+				struct lsa_DATA_BUF_PTR *old_val /* [in,out] [unique] */,
+				NTTIME *old_mtime /* [in,out] [unique] */);
 NTSTATUS rpccli_lsa_LookupPrivValue(struct rpc_pipe_client *cli,
 				    TALLOC_CTX *mem_ctx,
-				    struct policy_handle *handle,
-				    struct lsa_String *name,
-				    struct lsa_LUID *luid);
+				    struct policy_handle *handle /* [in] [ref] */,
+				    struct lsa_String *name /* [in] [ref] */,
+				    struct lsa_LUID *luid /* [out] [ref] */);
 NTSTATUS rpccli_lsa_LookupPrivName(struct rpc_pipe_client *cli,
 				   TALLOC_CTX *mem_ctx,
-				   struct policy_handle *handle,
-				   struct lsa_LUID *luid,
-				   struct lsa_StringLarge *name);
+				   struct policy_handle *handle /* [in] [ref] */,
+				   struct lsa_LUID *luid /* [in] [ref] */,
+				   struct lsa_StringLarge *name /* [out] [unique] */);
 NTSTATUS rpccli_lsa_LookupPrivDisplayName(struct rpc_pipe_client *cli,
 					  TALLOC_CTX *mem_ctx,
-					  struct policy_handle *handle,
-					  struct lsa_String *name,
-					  uint16_t language_id,
-					  uint16_t language_id_sys,
-					  struct lsa_StringLarge **disp_name,
-					  uint16_t *returned_language_id);
+					  struct policy_handle *handle /* [in] [ref] */,
+					  struct lsa_String *name /* [in] [ref] */,
+					  uint16_t language_id /* [in]  */,
+					  uint16_t language_id_sys /* [in]  */,
+					  struct lsa_StringLarge **disp_name /* [out] [ref] */,
+					  uint16_t *returned_language_id /* [out] [ref] */);
 NTSTATUS rpccli_lsa_DeleteObject(struct rpc_pipe_client *cli,
 				 TALLOC_CTX *mem_ctx,
-				 struct policy_handle *handle);
+				 struct policy_handle *handle /* [in,out] [ref] */);
 NTSTATUS rpccli_lsa_EnumAccountsWithUserRight(struct rpc_pipe_client *cli,
 					      TALLOC_CTX *mem_ctx,
-					      struct policy_handle *handle,
-					      struct lsa_String *name,
-					      struct lsa_SidArray *sids);
+					      struct policy_handle *handle /* [in] [ref] */,
+					      struct lsa_String *name /* [in] [unique] */,
+					      struct lsa_SidArray *sids /* [out] [ref] */);
 NTSTATUS rpccli_lsa_EnumAccountRights(struct rpc_pipe_client *cli,
 				      TALLOC_CTX *mem_ctx,
-				      struct policy_handle *handle,
-				      struct dom_sid2 *sid,
-				      struct lsa_RightSet *rights);
+				      struct policy_handle *handle /* [in] [ref] */,
+				      struct dom_sid2 *sid /* [in] [ref] */,
+				      struct lsa_RightSet *rights /* [out] [ref] */);
 NTSTATUS rpccli_lsa_AddAccountRights(struct rpc_pipe_client *cli,
 				     TALLOC_CTX *mem_ctx,
-				     struct policy_handle *handle,
-				     struct dom_sid2 *sid,
-				     struct lsa_RightSet *rights);
+				     struct policy_handle *handle /* [in] [ref] */,
+				     struct dom_sid2 *sid /* [in] [ref] */,
+				     struct lsa_RightSet *rights /* [in] [ref] */);
 NTSTATUS rpccli_lsa_RemoveAccountRights(struct rpc_pipe_client *cli,
 					TALLOC_CTX *mem_ctx,
-					struct policy_handle *handle,
-					struct dom_sid2 *sid,
-					uint8_t remove_all,
-					struct lsa_RightSet *rights);
+					struct policy_handle *handle /* [in] [ref] */,
+					struct dom_sid2 *sid /* [in] [ref] */,
+					uint8_t remove_all /* [in]  */,
+					struct lsa_RightSet *rights /* [in] [ref] */);
 NTSTATUS rpccli_lsa_QueryTrustedDomainInfoBySid(struct rpc_pipe_client *cli,
 						TALLOC_CTX *mem_ctx,
-						struct policy_handle *handle,
-						struct dom_sid2 *dom_sid,
-						enum lsa_TrustDomInfoEnum level,
-						union lsa_TrustedDomainInfo *info);
+						struct policy_handle *handle /* [in] [ref] */,
+						struct dom_sid2 *dom_sid /* [in] [ref] */,
+						enum lsa_TrustDomInfoEnum level /* [in]  */,
+						union lsa_TrustedDomainInfo *info /* [out] [unique,switch_is(level)] */);
 NTSTATUS rpccli_lsa_SetTrustedDomainInfo(struct rpc_pipe_client *cli,
 					 TALLOC_CTX *mem_ctx);
 NTSTATUS rpccli_lsa_DeleteTrustedDomain(struct rpc_pipe_client *cli,
 					TALLOC_CTX *mem_ctx,
-					struct policy_handle *handle,
-					struct dom_sid2 *dom_sid);
+					struct policy_handle *handle /* [in] [ref] */,
+					struct dom_sid2 *dom_sid /* [in] [ref] */);
 NTSTATUS rpccli_lsa_StorePrivateData(struct rpc_pipe_client *cli,
 				     TALLOC_CTX *mem_ctx);
 NTSTATUS rpccli_lsa_RetrievePrivateData(struct rpc_pipe_client *cli,
 					TALLOC_CTX *mem_ctx);
 NTSTATUS rpccli_lsa_OpenPolicy2(struct rpc_pipe_client *cli,
 				TALLOC_CTX *mem_ctx,
-				const char *system_name,
-				struct lsa_ObjectAttribute *attr,
-				uint32_t access_mask,
-				struct policy_handle *handle);
+				const char *system_name /* [in] [unique,charset(UTF16)] */,
+				struct lsa_ObjectAttribute *attr /* [in] [ref] */,
+				uint32_t access_mask /* [in]  */,
+				struct policy_handle *handle /* [out] [ref] */);
 NTSTATUS rpccli_lsa_GetUserName(struct rpc_pipe_client *cli,
 				TALLOC_CTX *mem_ctx,
-				const char *system_name,
-				struct lsa_String **account_name,
-				struct lsa_String **authority_name);
+				const char *system_name /* [in] [unique,charset(UTF16)] */,
+				struct lsa_String **account_name /* [in,out] [ref] */,
+				struct lsa_String **authority_name /* [in,out] [unique] */);
 NTSTATUS rpccli_lsa_QueryInfoPolicy2(struct rpc_pipe_client *cli,
 				     TALLOC_CTX *mem_ctx,
-				     struct policy_handle *handle,
-				     enum lsa_PolicyInfo level,
-				     union lsa_PolicyInformation **info);
+				     struct policy_handle *handle /* [in] [ref] */,
+				     enum lsa_PolicyInfo level /* [in]  */,
+				     union lsa_PolicyInformation **info /* [out] [ref,switch_is(level)] */);
 NTSTATUS rpccli_lsa_SetInfoPolicy2(struct rpc_pipe_client *cli,
 				   TALLOC_CTX *mem_ctx,
-				   struct policy_handle *handle,
-				   enum lsa_PolicyInfo level,
-				   union lsa_PolicyInformation *info);
+				   struct policy_handle *handle /* [in] [ref] */,
+				   enum lsa_PolicyInfo level /* [in]  */,
+				   union lsa_PolicyInformation *info /* [in] [ref,switch_is(level)] */);
 NTSTATUS rpccli_lsa_QueryTrustedDomainInfoByName(struct rpc_pipe_client *cli,
 						 TALLOC_CTX *mem_ctx,
-						 struct policy_handle *handle,
-						 struct lsa_String *trusted_domain,
-						 enum lsa_TrustDomInfoEnum level,
-						 union lsa_TrustedDomainInfo *info);
+						 struct policy_handle *handle /* [in] [ref] */,
+						 struct lsa_String *trusted_domain /* [in] [ref] */,
+						 enum lsa_TrustDomInfoEnum level /* [in]  */,
+						 union lsa_TrustedDomainInfo *info /* [out] [ref,switch_is(level)] */);
 NTSTATUS rpccli_lsa_SetTrustedDomainInfoByName(struct rpc_pipe_client *cli,
 					       TALLOC_CTX *mem_ctx,
-					       struct policy_handle *handle,
-					       struct lsa_String trusted_domain,
-					       enum lsa_TrustDomInfoEnum level,
-					       union lsa_TrustedDomainInfo *info);
+					       struct policy_handle *handle /* [in] [ref] */,
+					       struct lsa_String trusted_domain /* [in]  */,
+					       enum lsa_TrustDomInfoEnum level /* [in]  */,
+					       union lsa_TrustedDomainInfo *info /* [in] [unique,switch_is(level)] */);
 NTSTATUS rpccli_lsa_EnumTrustedDomainsEx(struct rpc_pipe_client *cli,
 					 TALLOC_CTX *mem_ctx,
-					 struct policy_handle *handle,
-					 uint32_t *resume_handle,
-					 struct lsa_DomainListEx *domains,
-					 uint32_t max_size);
+					 struct policy_handle *handle /* [in] [ref] */,
+					 uint32_t *resume_handle /* [in,out] [ref] */,
+					 struct lsa_DomainListEx *domains /* [out] [ref] */,
+					 uint32_t max_size /* [in]  */);
 NTSTATUS rpccli_lsa_CreateTrustedDomainEx(struct rpc_pipe_client *cli,
 					  TALLOC_CTX *mem_ctx);
 NTSTATUS rpccli_lsa_CloseTrustedDomainEx(struct rpc_pipe_client *cli,
 					 TALLOC_CTX *mem_ctx,
-					 struct policy_handle *handle);
+					 struct policy_handle *handle /* [in,out] [ref] */);
 NTSTATUS rpccli_lsa_QueryDomainInformationPolicy(struct rpc_pipe_client *cli,
 						 TALLOC_CTX *mem_ctx,
-						 struct policy_handle *handle,
-						 uint16_t level,
-						 union lsa_DomainInformationPolicy *info);
+						 struct policy_handle *handle /* [in] [ref] */,
+						 uint16_t level /* [in]  */,
+						 union lsa_DomainInformationPolicy *info /* [out] [unique,switch_is(level)] */);
 NTSTATUS rpccli_lsa_SetDomainInformationPolicy(struct rpc_pipe_client *cli,
 					       TALLOC_CTX *mem_ctx,
-					       struct policy_handle *handle,
-					       uint16_t level,
-					       union lsa_DomainInformationPolicy *info);
+					       struct policy_handle *handle /* [in] [ref] */,
+					       uint16_t level /* [in]  */,
+					       union lsa_DomainInformationPolicy *info /* [in] [unique,switch_is(level)] */);
 NTSTATUS rpccli_lsa_OpenTrustedDomainByName(struct rpc_pipe_client *cli,
 					    TALLOC_CTX *mem_ctx,
-					    struct policy_handle *handle,
-					    struct lsa_String name,
-					    uint32_t access_mask,
-					    struct policy_handle *trustdom_handle);
+					    struct policy_handle *handle /* [in] [ref] */,
+					    struct lsa_String name /* [in]  */,
+					    uint32_t access_mask /* [in]  */,
+					    struct policy_handle *trustdom_handle /* [out] [ref] */);
 NTSTATUS rpccli_lsa_TestCall(struct rpc_pipe_client *cli,
 			     TALLOC_CTX *mem_ctx);
 NTSTATUS rpccli_lsa_LookupSids2(struct rpc_pipe_client *cli,
 				TALLOC_CTX *mem_ctx,
-				struct policy_handle *handle,
-				struct lsa_SidArray *sids,
-				struct lsa_RefDomainList **domains,
-				struct lsa_TransNameArray2 *names,
-				uint16_t level,
-				uint32_t *count,
-				uint32_t unknown1,
-				uint32_t unknown2);
+				struct policy_handle *handle /* [in] [ref] */,
+				struct lsa_SidArray *sids /* [in] [ref] */,
+				struct lsa_RefDomainList **domains /* [out] [ref] */,
+				struct lsa_TransNameArray2 *names /* [in,out] [ref] */,
+				uint16_t level /* [in]  */,
+				uint32_t *count /* [in,out] [ref] */,
+				uint32_t unknown1 /* [in]  */,
+				uint32_t unknown2 /* [in]  */);
 NTSTATUS rpccli_lsa_LookupNames2(struct rpc_pipe_client *cli,
 				 TALLOC_CTX *mem_ctx,
-				 struct policy_handle *handle,
-				 uint32_t num_names,
-				 struct lsa_String *names,
-				 struct lsa_RefDomainList **domains,
-				 struct lsa_TransSidArray2 *sids,
-				 enum lsa_LookupNamesLevel level,
-				 uint32_t *count,
-				 uint32_t unknown1,
-				 uint32_t unknown2);
+				 struct policy_handle *handle /* [in] [ref] */,
+				 uint32_t num_names /* [in] [range(0,1000)] */,
+				 struct lsa_String *names /* [in] [size_is(num_names)] */,
+				 struct lsa_RefDomainList **domains /* [out] [ref] */,
+				 struct lsa_TransSidArray2 *sids /* [in,out] [ref] */,
+				 enum lsa_LookupNamesLevel level /* [in]  */,
+				 uint32_t *count /* [in,out] [ref] */,
+				 uint32_t unknown1 /* [in]  */,
+				 uint32_t unknown2 /* [in]  */);
 NTSTATUS rpccli_lsa_CreateTrustedDomainEx2(struct rpc_pipe_client *cli,
 					   TALLOC_CTX *mem_ctx);
 NTSTATUS rpccli_lsa_CREDRWRITE(struct rpc_pipe_client *cli,
@@ -313,15 +313,15 @@ NTSTATUS rpccli_lsa_CREDRPROFILELOADED(struct rpc_pipe_client *cli,
 				       TALLOC_CTX *mem_ctx);
 NTSTATUS rpccli_lsa_LookupNames3(struct rpc_pipe_client *cli,
 				 TALLOC_CTX *mem_ctx,
-				 struct policy_handle *handle,
-				 uint32_t num_names,
-				 struct lsa_String *names,
-				 struct lsa_RefDomainList **domains,
-				 struct lsa_TransSidArray3 *sids,
-				 enum lsa_LookupNamesLevel level,
-				 uint32_t *count,
-				 uint32_t unknown1,
-				 uint32_t unknown2);
+				 struct policy_handle *handle /* [in] [ref] */,
+				 uint32_t num_names /* [in] [range(0,1000)] */,
+				 struct lsa_String *names /* [in] [size_is(num_names)] */,
+				 struct lsa_RefDomainList **domains /* [out] [ref] */,
+				 struct lsa_TransSidArray3 *sids /* [in,out] [ref] */,
+				 enum lsa_LookupNamesLevel level /* [in]  */,
+				 uint32_t *count /* [in,out] [ref] */,
+				 uint32_t unknown1 /* [in]  */,
+				 uint32_t unknown2 /* [in]  */);
 NTSTATUS rpccli_lsa_CREDRGETSESSIONTYPES(struct rpc_pipe_client *cli,
 					 TALLOC_CTX *mem_ctx);
 NTSTATUS rpccli_lsa_LSARREGISTERAUDITEVENT(struct rpc_pipe_client *cli,
@@ -332,33 +332,33 @@ NTSTATUS rpccli_lsa_LSARUNREGISTERAUDITEVENT(struct rpc_pipe_client *cli,
 					     TALLOC_CTX *mem_ctx);
 NTSTATUS rpccli_lsa_lsaRQueryForestTrustInformation(struct rpc_pipe_client *cli,
 						    TALLOC_CTX *mem_ctx,
-						    struct policy_handle *handle,
-						    struct lsa_String *trusted_domain_name,
-						    uint16_t unknown,
-						    struct lsa_ForestTrustInformation **forest_trust_info);
+						    struct policy_handle *handle /* [in] [ref] */,
+						    struct lsa_String *trusted_domain_name /* [in] [ref] */,
+						    uint16_t unknown /* [in]  */,
+						    struct lsa_ForestTrustInformation **forest_trust_info /* [out] [ref] */);
 NTSTATUS rpccli_lsa_LSARSETFORESTTRUSTINFORMATION(struct rpc_pipe_client *cli,
 						  TALLOC_CTX *mem_ctx);
 NTSTATUS rpccli_lsa_CREDRRENAME(struct rpc_pipe_client *cli,
 				TALLOC_CTX *mem_ctx);
 NTSTATUS rpccli_lsa_LookupSids3(struct rpc_pipe_client *cli,
 				TALLOC_CTX *mem_ctx,
-				struct lsa_SidArray *sids,
-				struct lsa_RefDomainList **domains,
-				struct lsa_TransNameArray2 *names,
-				uint16_t level,
-				uint32_t *count,
-				uint32_t unknown1,
-				uint32_t unknown2);
+				struct lsa_SidArray *sids /* [in] [ref] */,
+				struct lsa_RefDomainList **domains /* [out] [ref] */,
+				struct lsa_TransNameArray2 *names /* [in,out] [ref] */,
+				uint16_t level /* [in]  */,
+				uint32_t *count /* [in,out] [ref] */,
+				uint32_t unknown1 /* [in]  */,
+				uint32_t unknown2 /* [in]  */);
 NTSTATUS rpccli_lsa_LookupNames4(struct rpc_pipe_client *cli,
 				 TALLOC_CTX *mem_ctx,
-				 uint32_t num_names,
-				 struct lsa_String *names,
-				 struct lsa_RefDomainList **domains,
-				 struct lsa_TransSidArray3 *sids,
-				 enum lsa_LookupNamesLevel level,
-				 uint32_t *count,
-				 uint32_t unknown1,
-				 uint32_t unknown2);
+				 uint32_t num_names /* [in] [range(0,1000)] */,
+				 struct lsa_String *names /* [in] [size_is(num_names)] */,
+				 struct lsa_RefDomainList **domains /* [out] [ref] */,
+				 struct lsa_TransSidArray3 *sids /* [in,out] [ref] */,
+				 enum lsa_LookupNamesLevel level /* [in]  */,
+				 uint32_t *count /* [in,out] [ref] */,
+				 uint32_t unknown1 /* [in]  */,
+				 uint32_t unknown2 /* [in]  */);
 NTSTATUS rpccli_lsa_LSAROPENPOLICYSCE(struct rpc_pipe_client *cli,
 				      TALLOC_CTX *mem_ctx);
 NTSTATUS rpccli_lsa_LSARADTREGISTERSECURITYEVENTSOURCE(struct rpc_pipe_client *cli,
diff --git a/source3/librpc/gen_ndr/cli_netlogon.c b/source3/librpc/gen_ndr/cli_netlogon.c
index 2937cc09b9..0ad1d03f66 100644
--- a/source3/librpc/gen_ndr/cli_netlogon.c
+++ b/source3/librpc/gen_ndr/cli_netlogon.c
@@ -8,10 +8,10 @@
 
 NTSTATUS rpccli_netr_LogonUasLogon(struct rpc_pipe_client *cli,
 				   TALLOC_CTX *mem_ctx,
-				   const char *server_name,
-				   const char *account_name,
-				   const char *workstation,
-				   struct netr_UasInfo *info,
+				   const char *server_name /* [in] [unique,charset(UTF16)] */,
+				   const char *account_name /* [in] [charset(UTF16)] */,
+				   const char *workstation /* [in] [charset(UTF16)] */,
+				   struct netr_UasInfo *info /* [out] [ref] */,
 				   WERROR *werror)
 {
 	struct netr_LogonUasLogon r;
@@ -58,10 +58,10 @@ NTSTATUS rpccli_netr_LogonUasLogon(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_netr_LogonUasLogoff(struct rpc_pipe_client *cli,
 				    TALLOC_CTX *mem_ctx,
-				    const char *server_name,
-				    const char *account_name,
-				    const char *workstation,
-				    struct netr_UasLogoffInfo *info,
+				    const char *server_name /* [in] [unique,charset(UTF16)] */,
+				    const char *account_name /* [in] [charset(UTF16)] */,
+				    const char *workstation /* [in] [charset(UTF16)] */,
+				    struct netr_UasLogoffInfo *info /* [out] [ref] */,
 				    WERROR *werror)
 {
 	struct netr_LogonUasLogoff r;
@@ -108,15 +108,15 @@ NTSTATUS rpccli_netr_LogonUasLogoff(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_netr_LogonSamLogon(struct rpc_pipe_client *cli,
 				   TALLOC_CTX *mem_ctx,
-				   const char *server_name,
-				   const char *computer_name,
-				   struct netr_Authenticator *credential,
-				   struct netr_Authenticator *return_authenticator,
-				   uint16_t logon_level,
-				   union netr_LogonLevel *logon,
-				   uint16_t validation_level,
-				   union netr_Validation *validation,
-				   uint8_t *authoritative)
+				   const char *server_name /* [in] [unique,charset(UTF16)] */,
+				   const char *computer_name /* [in] [unique,charset(UTF16)] */,
+				   struct netr_Authenticator *credential /* [in] [unique] */,
+				   struct netr_Authenticator *return_authenticator /* [in,out] [unique] */,
+				   uint16_t logon_level /* [in]  */,
+				   union netr_LogonLevel *logon /* [in] [ref,switch_is(logon_level)] */,
+				   uint16_t validation_level /* [in]  */,
+				   union netr_Validation *validation /* [out] [ref,switch_is(validation_level)] */,
+				   uint8_t *authoritative /* [out] [ref] */)
 {
 	struct netr_LogonSamLogon r;
 	NTSTATUS status;
@@ -166,12 +166,12 @@ NTSTATUS rpccli_netr_LogonSamLogon(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_netr_LogonSamLogoff(struct rpc_pipe_client *cli,
 				    TALLOC_CTX *mem_ctx,
-				    const char *server_name,
-				    const char *computer_name,
-				    struct netr_Authenticator *credential,
-				    struct netr_Authenticator *return_authenticator,
-				    uint16_t logon_level,
-				    union netr_LogonLevel logon)
+				    const char *server_name /* [in] [unique,charset(UTF16)] */,
+				    const char *computer_name /* [in] [unique,charset(UTF16)] */,
+				    struct netr_Authenticator *credential /* [in] [unique] */,
+				    struct netr_Authenticator *return_authenticator /* [in,out] [unique] */,
+				    uint16_t logon_level /* [in]  */,
+				    union netr_LogonLevel logon /* [in] [switch_is(logon_level)] */)
 {
 	struct netr_LogonSamLogoff r;
 	NTSTATUS status;
@@ -218,10 +218,10 @@ NTSTATUS rpccli_netr_LogonSamLogoff(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_netr_ServerReqChallenge(struct rpc_pipe_client *cli,
 					TALLOC_CTX *mem_ctx,
-					const char *server_name,
-					const char *computer_name,
-					struct netr_Credential *credentials,
-					struct netr_Credential *return_credentials)
+					const char *server_name /* [in] [unique,charset(UTF16)] */,
+					const char *computer_name /* [in] [charset(UTF16)] */,
+					struct netr_Credential *credentials /* [in] [ref] */,
+					struct netr_Credential *return_credentials /* [out] [ref] */)
 {
 	struct netr_ServerReqChallenge r;
 	NTSTATUS status;
@@ -263,12 +263,12 @@ NTSTATUS rpccli_netr_ServerReqChallenge(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_netr_ServerAuthenticate(struct rpc_pipe_client *cli,
 					TALLOC_CTX *mem_ctx,
-					const char *server_name,
-					const char *account_name,
-					enum netr_SchannelType secure_channel_type,
-					const char *computer_name,
-					struct netr_Credential *credentials,
-					struct netr_Credential *return_credentials)
+					const char *server_name /* [in] [unique,charset(UTF16)] */,
+					const char *account_name /* [in] [charset(UTF16)] */,
+					enum netr_SchannelType secure_channel_type /* [in]  */,
+					const char *computer_name /* [in] [charset(UTF16)] */,
+					struct netr_Credential *credentials /* [in] [ref] */,
+					struct netr_Credential *return_credentials /* [out] [ref] */)
 {
 	struct netr_ServerAuthenticate r;
 	NTSTATUS status;
@@ -312,13 +312,13 @@ NTSTATUS rpccli_netr_ServerAuthenticate(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_netr_ServerPasswordSet(struct rpc_pipe_client *cli,
 				       TALLOC_CTX *mem_ctx,
-				       const char *server_name,
-				       const char *account_name,
-				       enum netr_SchannelType secure_channel_type,
-				       const char *computer_name,
-				       struct netr_Authenticator *credential,
-				       struct netr_Authenticator *return_authenticator,
-				       struct samr_Password *new_password)
+				       const char *server_name /* [in] [unique,charset(UTF16)] */,
+				       const char *account_name /* [in] [charset(UTF16)] */,
+				       enum netr_SchannelType secure_channel_type /* [in]  */,
+				       const char *computer_name /* [in] [charset(UTF16)] */,
+				       struct netr_Authenticator *credential /* [in] [ref] */,
+				       struct netr_Authenticator *return_authenticator /* [out] [ref] */,
+				       struct samr_Password *new_password /* [in] [ref] */)
 {
 	struct netr_ServerPasswordSet r;
 	NTSTATUS status;
@@ -363,14 +363,14 @@ NTSTATUS rpccli_netr_ServerPasswordSet(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_netr_DatabaseDeltas(struct rpc_pipe_client *cli,
 				    TALLOC_CTX *mem_ctx,
-				    const char *logon_server,
-				    const char *computername,
-				    struct netr_Authenticator *credential,
-				    struct netr_Authenticator *return_authenticator,
-				    enum netr_SamDatabaseID database_id,
-				    uint64_t *sequence_num,
-				    struct netr_DELTA_ENUM_ARRAY **delta_enum_array,
-				    uint32_t preferredmaximumlength)
+				    const char *logon_server /* [in] [charset(UTF16)] */,
+				    const char *computername /* [in] [charset(UTF16)] */,
+				    struct netr_Authenticator *credential /* [in] [ref] */,
+				    struct netr_Authenticator *return_authenticator /* [in,out] [ref] */,
+				    enum netr_SamDatabaseID database_id /* [in]  */,
+				    uint64_t *sequence_num /* [in,out] [ref] */,
+				    struct netr_DELTA_ENUM_ARRAY **delta_enum_array /* [out] [ref] */,
+				    uint32_t preferredmaximumlength /* [in]  */)
 {
 	struct netr_DatabaseDeltas r;
 	NTSTATUS status;
@@ -418,14 +418,14 @@ NTSTATUS rpccli_netr_DatabaseDeltas(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_netr_DatabaseSync(struct rpc_pipe_client *cli,
 				  TALLOC_CTX *mem_ctx,
-				  const char *logon_server,
-				  const char *computername,
-				  struct netr_Authenticator credential,
-				  struct netr_Authenticator *return_authenticator,
-				  enum netr_SamDatabaseID database_id,
-				  uint32_t *sync_context,
-				  uint32_t preferredmaximumlength,
-				  struct netr_DELTA_ENUM_ARRAY *delta_enum_array)
+				  const char *logon_server /* [in] [charset(UTF16)] */,
+				  const char *computername /* [in] [charset(UTF16)] */,
+				  struct netr_Authenticator credential /* [in]  */,
+				  struct netr_Authenticator *return_authenticator /* [in,out] [ref] */,
+				  enum netr_SamDatabaseID database_id /* [in]  */,
+				  uint32_t *sync_context /* [in,out] [ref] */,
+				  uint32_t preferredmaximumlength /* [in]  */,
+				  struct netr_DELTA_ENUM_ARRAY *delta_enum_array /* [out] [ref] */)
 {
 	struct netr_DatabaseSync r;
 	NTSTATUS status;
@@ -473,18 +473,18 @@ NTSTATUS rpccli_netr_DatabaseSync(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_netr_AccountDeltas(struct rpc_pipe_client *cli,
 				   TALLOC_CTX *mem_ctx,
-				   const char *logon_server,
-				   const char *computername,
-				   struct netr_Authenticator credential,
-				   struct netr_Authenticator *return_authenticator,
-				   struct netr_UAS_INFO_0 uas,
-				   uint32_t count,
-				   uint32_t level,
-				   uint32_t buffersize,
-				   struct netr_AccountBuffer *buffer,
-				   uint32_t *count_returned,
-				   uint32_t *total_entries,
-				   struct netr_UAS_INFO_0 *recordid)
+				   const char *logon_server /* [in] [unique,charset(UTF16)] */,
+				   const char *computername /* [in] [charset(UTF16)] */,
+				   struct netr_Authenticator credential /* [in]  */,
+				   struct netr_Authenticator *return_authenticator /* [in,out] [ref] */,
+				   struct netr_UAS_INFO_0 uas /* [in]  */,
+				   uint32_t count /* [in]  */,
+				   uint32_t level /* [in]  */,
+				   uint32_t buffersize /* [in]  */,
+				   struct netr_AccountBuffer *buffer /* [out] [ref,subcontext(4)] */,
+				   uint32_t *count_returned /* [out] [ref] */,
+				   uint32_t *total_entries /* [out] [ref] */,
+				   struct netr_UAS_INFO_0 *recordid /* [out] [ref] */)
 {
 	struct netr_AccountDeltas r;
 	NTSTATUS status;
@@ -535,18 +535,18 @@ NTSTATUS rpccli_netr_AccountDeltas(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_netr_AccountSync(struct rpc_pipe_client *cli,
 				 TALLOC_CTX *mem_ctx,
-				 const char *logon_server,
-				 const char *computername,
-				 struct netr_Authenticator credential,
-				 struct netr_Authenticator *return_authenticator,
-				 uint32_t reference,
-				 uint32_t level,
-				 uint32_t buffersize,
-				 struct netr_AccountBuffer *buffer,
-				 uint32_t *count_returned,
-				 uint32_t *total_entries,
-				 uint32_t *next_reference,
-				 struct netr_UAS_INFO_0 *recordid)
+				 const char *logon_server /* [in] [unique,charset(UTF16)] */,
+				 const char *computername /* [in] [charset(UTF16)] */,
+				 struct netr_Authenticator credential /* [in]  */,
+				 struct netr_Authenticator *return_authenticator /* [in,out] [ref] */,
+				 uint32_t reference /* [in]  */,
+				 uint32_t level /* [in]  */,
+				 uint32_t buffersize /* [in]  */,
+				 struct netr_AccountBuffer *buffer /* [out] [ref,subcontext(4)] */,
+				 uint32_t *count_returned /* [out] [ref] */,
+				 uint32_t *total_entries /* [out] [ref] */,
+				 uint32_t *next_reference /* [out] [ref] */,
+				 struct netr_UAS_INFO_0 *recordid /* [in,out] [ref] */)
 {
 	struct netr_AccountSync r;
 	NTSTATUS status;
@@ -598,9 +598,9 @@ NTSTATUS rpccli_netr_AccountSync(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_netr_GetDcName(struct rpc_pipe_client *cli,
 			       TALLOC_CTX *mem_ctx,
-			       const char *logon_server,
-			       const char *domainname,
-			       const char **dcname,
+			       const char *logon_server /* [in] [charset(UTF16)] */,
+			       const char *domainname /* [in] [unique,charset(UTF16)] */,
+			       const char **dcname /* [out] [ref,charset(UTF16)] */,
 			       WERROR *werror)
 {
 	struct netr_GetDcName r;
@@ -646,10 +646,10 @@ NTSTATUS rpccli_netr_GetDcName(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_netr_LogonControl(struct rpc_pipe_client *cli,
 				  TALLOC_CTX *mem_ctx,
-				  const char *logon_server,
-				  enum netr_LogonControlCode function_code,
-				  uint32_t level,
-				  union netr_CONTROL_QUERY_INFORMATION *info,
+				  const char *logon_server /* [in] [unique,charset(UTF16)] */,
+				  enum netr_LogonControlCode function_code /* [in]  */,
+				  uint32_t level /* [in]  */,
+				  union netr_CONTROL_QUERY_INFORMATION *info /* [out] [ref,switch_is(level)] */,
 				  WERROR *werror)
 {
 	struct netr_LogonControl r;
@@ -696,9 +696,9 @@ NTSTATUS rpccli_netr_LogonControl(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_netr_GetAnyDCName(struct rpc_pipe_client *cli,
 				  TALLOC_CTX *mem_ctx,
-				  const char *logon_server,
-				  const char *domainname,
-				  const char **dcname,
+				  const char *logon_server /* [in] [unique,charset(UTF16)] */,
+				  const char *domainname /* [in] [unique,charset(UTF16)] */,
+				  const char **dcname /* [out] [ref,charset(UTF16)] */,
 				  WERROR *werror)
 {
 	struct netr_GetAnyDCName r;
@@ -744,11 +744,11 @@ NTSTATUS rpccli_netr_GetAnyDCName(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_netr_LogonControl2(struct rpc_pipe_client *cli,
 				   TALLOC_CTX *mem_ctx,
-				   const char *logon_server,
-				   uint32_t function_code,
-				   uint32_t level,
-				   union netr_CONTROL_DATA_INFORMATION *data,
-				   union netr_CONTROL_QUERY_INFORMATION *query,
+				   const char *logon_server /* [in] [unique,charset(UTF16)] */,
+				   uint32_t function_code /* [in]  */,
+				   uint32_t level /* [in]  */,
+				   union netr_CONTROL_DATA_INFORMATION *data /* [in] [ref,switch_is(function_code)] */,
+				   union netr_CONTROL_QUERY_INFORMATION *query /* [out] [ref,switch_is(level)] */,
 				   WERROR *werror)
 {
 	struct netr_LogonControl2 r;
@@ -796,13 +796,13 @@ NTSTATUS rpccli_netr_LogonControl2(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_netr_ServerAuthenticate2(struct rpc_pipe_client *cli,
 					 TALLOC_CTX *mem_ctx,
-					 const char *server_name,
-					 const char *account_name,
-					 enum netr_SchannelType secure_channel_type,
-					 const char *computer_name,
-					 struct netr_Credential *credentials,
-					 struct netr_Credential *return_credentials,
-					 uint32_t *negotiate_flags)
+					 const char *server_name /* [in] [unique,charset(UTF16)] */,
+					 const char *account_name /* [in] [charset(UTF16)] */,
+					 enum netr_SchannelType secure_channel_type /* [in]  */,
+					 const char *computer_name /* [in] [charset(UTF16)] */,
+					 struct netr_Credential *credentials /* [in] [ref] */,
+					 struct netr_Credential *return_credentials /* [out] [ref] */,
+					 uint32_t *negotiate_flags /* [in,out] [ref] */)
 {
 	struct netr_ServerAuthenticate2 r;
 	NTSTATUS status;
@@ -848,15 +848,15 @@ NTSTATUS rpccli_netr_ServerAuthenticate2(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_netr_DatabaseSync2(struct rpc_pipe_client *cli,
 				   TALLOC_CTX *mem_ctx,
-				   const char *logon_server,
-				   const char *computername,
-				   struct netr_Authenticator *credential,
-				   struct netr_Authenticator *return_authenticator,
-				   enum netr_SamDatabaseID database_id,
-				   uint16_t restart_state,
-				   uint32_t *sync_context,
-				   struct netr_DELTA_ENUM_ARRAY **delta_enum_array,
-				   uint32_t preferredmaximumlength)
+				   const char *logon_server /* [in] [charset(UTF16)] */,
+				   const char *computername /* [in] [charset(UTF16)] */,
+				   struct netr_Authenticator *credential /* [in] [ref] */,
+				   struct netr_Authenticator *return_authenticator /* [in,out] [ref] */,
+				   enum netr_SamDatabaseID database_id /* [in]  */,
+				   uint16_t restart_state /* [in]  */,
+				   uint32_t *sync_context /* [in,out] [ref] */,
+				   struct netr_DELTA_ENUM_ARRAY **delta_enum_array /* [out] [ref] */,
+				   uint32_t preferredmaximumlength /* [in]  */)
 {
 	struct netr_DatabaseSync2 r;
 	NTSTATUS status;
@@ -905,13 +905,13 @@ NTSTATUS rpccli_netr_DatabaseSync2(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_netr_DatabaseRedo(struct rpc_pipe_client *cli,
 				  TALLOC_CTX *mem_ctx,
-				  const char *logon_server,
-				  const char *computername,
-				  struct netr_Authenticator credential,
-				  struct netr_Authenticator *return_authenticator,
-				  uint8_t *change_log_entry,
-				  uint32_t change_log_entry_size,
-				  struct netr_DELTA_ENUM_ARRAY *delta_enum_array)
+				  const char *logon_server /* [in] [charset(UTF16)] */,
+				  const char *computername /* [in] [charset(UTF16)] */,
+				  struct netr_Authenticator credential /* [in]  */,
+				  struct netr_Authenticator *return_authenticator /* [in,out] [ref] */,
+				  uint8_t *change_log_entry /* [in] [unique,size_is(change_log_entry_size)] */,
+				  uint32_t change_log_entry_size /* [in]  */,
+				  struct netr_DELTA_ENUM_ARRAY *delta_enum_array /* [out] [ref] */)
 {
 	struct netr_DatabaseRedo r;
 	NTSTATUS status;
@@ -957,11 +957,11 @@ NTSTATUS rpccli_netr_DatabaseRedo(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_netr_LogonControl2Ex(struct rpc_pipe_client *cli,
 				     TALLOC_CTX *mem_ctx,
-				     const char *logon_server,
-				     uint32_t function_code,
-				     uint32_t level,
-				     union netr_CONTROL_DATA_INFORMATION data,
-				     union netr_CONTROL_QUERY_INFORMATION *query,
+				     const char *logon_server /* [in] [unique,charset(UTF16)] */,
+				     uint32_t function_code /* [in]  */,
+				     uint32_t level /* [in]  */,
+				     union netr_CONTROL_DATA_INFORMATION data /* [in] [switch_is(function_code)] */,
+				     union netr_CONTROL_QUERY_INFORMATION *query /* [out] [ref,switch_is(level)] */,
 				     WERROR *werror)
 {
 	struct netr_LogonControl2Ex r;
@@ -1009,8 +1009,8 @@ NTSTATUS rpccli_netr_LogonControl2Ex(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_netr_NetrEnumerateTrustedDomains(struct rpc_pipe_client *cli,
 						 TALLOC_CTX *mem_ctx,
-						 const char *server_name,
-						 struct netr_Blob *trusted_domains_blob,
+						 const char *server_name /* [in] [unique,charset(UTF16)] */,
+						 struct netr_Blob *trusted_domains_blob /* [out] [ref] */,
 						 WERROR *werror)
 {
 	struct netr_NetrEnumerateTrustedDomains r;
@@ -1055,12 +1055,12 @@ NTSTATUS rpccli_netr_NetrEnumerateTrustedDomains(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_netr_DsRGetDCName(struct rpc_pipe_client *cli,
 				  TALLOC_CTX *mem_ctx,
-				  const char *server_unc,
-				  const char *domain_name,
-				  struct GUID *domain_guid,
-				  struct GUID *site_guid,
-				  uint32_t flags,
-				  struct netr_DsRGetDCNameInfo **info,
+				  const char *server_unc /* [in] [unique,charset(UTF16)] */,
+				  const char *domain_name /* [in] [unique,charset(UTF16)] */,
+				  struct GUID *domain_guid /* [in] [unique] */,
+				  struct GUID *site_guid /* [in] [unique] */,
+				  uint32_t flags /* [in]  */,
+				  struct netr_DsRGetDCNameInfo **info /* [out] [ref] */,
 				  WERROR *werror)
 {
 	struct netr_DsRGetDCName r;
@@ -1193,9 +1193,9 @@ NTSTATUS rpccli_netr_NETRLOGONSETSERVICEBITS(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_netr_LogonGetTrustRid(struct rpc_pipe_client *cli,
 				      TALLOC_CTX *mem_ctx,
-				      const char *server_name,
-				      const char *domain_name,
-				      uint32_t *rid,
+				      const char *server_name /* [in] [unique,charset(UTF16)] */,
+				      const char *domain_name /* [in] [unique,charset(UTF16)] */,
+				      uint32_t *rid /* [out] [ref] */,
 				      WERROR *werror)
 {
 	struct netr_LogonGetTrustRid r;
@@ -1325,13 +1325,13 @@ NTSTATUS rpccli_netr_NETRLOGONCOMPUTECLIENTDIGEST(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_netr_ServerAuthenticate3(struct rpc_pipe_client *cli,
 					 TALLOC_CTX *mem_ctx,
-					 const char *server_name,
-					 const char *account_name,
-					 enum netr_SchannelType secure_channel_type,
-					 const char *computer_name,
-					 struct netr_Credential *credentials,
-					 uint32_t *negotiate_flags,
-					 uint32_t *rid)
+					 const char *server_name /* [in] [unique,charset(UTF16)] */,
+					 const char *account_name /* [in] [charset(UTF16)] */,
+					 enum netr_SchannelType secure_channel_type /* [in]  */,
+					 const char *computer_name /* [in] [charset(UTF16)] */,
+					 struct netr_Credential *credentials /* [in,out] [ref] */,
+					 uint32_t *negotiate_flags /* [in,out] [ref] */,
+					 uint32_t *rid /* [out] [ref] */)
 {
 	struct netr_ServerAuthenticate3 r;
 	NTSTATUS status;
@@ -1378,12 +1378,12 @@ NTSTATUS rpccli_netr_ServerAuthenticate3(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_netr_DsRGetDCNameEx(struct rpc_pipe_client *cli,
 				    TALLOC_CTX *mem_ctx,
-				    const char *server_unc,
-				    const char *domain_name,
-				    struct GUID *domain_guid,
-				    const char *site_name,
-				    uint32_t flags,
-				    struct netr_DsRGetDCNameInfo **info,
+				    const char *server_unc /* [in] [unique,charset(UTF16)] */,
+				    const char *domain_name /* [in] [unique,charset(UTF16)] */,
+				    struct GUID *domain_guid /* [in] [unique] */,
+				    const char *site_name /* [in] [unique,charset(UTF16)] */,
+				    uint32_t flags /* [in]  */,
+				    struct netr_DsRGetDCNameInfo **info /* [out] [ref] */,
 				    WERROR *werror)
 {
 	struct netr_DsRGetDCNameEx r;
@@ -1432,8 +1432,8 @@ NTSTATUS rpccli_netr_DsRGetDCNameEx(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_netr_DsRGetSiteName(struct rpc_pipe_client *cli,
 				    TALLOC_CTX *mem_ctx,
-				    const char *computer_name,
-				    const char **site,
+				    const char *computer_name /* [in] [unique,charset(UTF16)] */,
+				    const char **site /* [out] [ref,charset(UTF16)] */,
 				    WERROR *werror)
 {
 	struct netr_DsRGetSiteName r;
@@ -1478,13 +1478,13 @@ NTSTATUS rpccli_netr_DsRGetSiteName(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_netr_LogonGetDomainInfo(struct rpc_pipe_client *cli,
 					TALLOC_CTX *mem_ctx,
-					const char *server_name,
-					const char *computer_name,
-					struct netr_Authenticator *credential,
-					struct netr_Authenticator *return_authenticator,
-					uint32_t level,
-					union netr_DomainQuery query,
-					union netr_DomainInfo *info)
+					const char *server_name /* [in] [charset(UTF16)] */,
+					const char *computer_name /* [in] [unique,charset(UTF16)] */,
+					struct netr_Authenticator *credential /* [in] [ref] */,
+					struct netr_Authenticator *return_authenticator /* [in,out] [ref] */,
+					uint32_t level /* [in]  */,
+					union netr_DomainQuery query /* [in] [switch_is(level)] */,
+					union netr_DomainInfo *info /* [out] [ref,switch_is(level)] */)
 {
 	struct netr_LogonGetDomainInfo r;
 	NTSTATUS status;
@@ -1530,13 +1530,13 @@ NTSTATUS rpccli_netr_LogonGetDomainInfo(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_netr_ServerPasswordSet2(struct rpc_pipe_client *cli,
 					TALLOC_CTX *mem_ctx,
-					const char *server_name,
-					const char *account_name,
-					enum netr_SchannelType secure_channel_type,
-					const char *computer_name,
-					struct netr_Authenticator credential,
-					struct netr_CryptPassword new_password,
-					struct netr_Authenticator *return_authenticator)
+					const char *server_name /* [in] [unique,charset(UTF16)] */,
+					const char *account_name /* [in] [charset(UTF16)] */,
+					enum netr_SchannelType secure_channel_type /* [in]  */,
+					const char *computer_name /* [in] [charset(UTF16)] */,
+					struct netr_Authenticator credential /* [in]  */,
+					struct netr_CryptPassword new_password /* [in]  */,
+					struct netr_Authenticator *return_authenticator /* [out] [ref] */)
 {
 	struct netr_ServerPasswordSet2 r;
 	NTSTATUS status;
@@ -1581,13 +1581,13 @@ NTSTATUS rpccli_netr_ServerPasswordSet2(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_netr_ServerPasswordGet(struct rpc_pipe_client *cli,
 				       TALLOC_CTX *mem_ctx,
-				       const char *server_name,
-				       const char *account_name,
-				       enum netr_SchannelType secure_channel_type,
-				       const char *computer_name,
-				       struct netr_Authenticator *credential,
-				       struct netr_Authenticator *return_authenticator,
-				       struct samr_Password *password,
+				       const char *server_name /* [in] [unique,charset(UTF16)] */,
+				       const char *account_name /* [in] [charset(UTF16)] */,
+				       enum netr_SchannelType secure_channel_type /* [in]  */,
+				       const char *computer_name /* [in] [charset(UTF16)] */,
+				       struct netr_Authenticator *credential /* [in] [ref] */,
+				       struct netr_Authenticator *return_authenticator /* [out] [ref] */,
+				       struct samr_Password *password /* [out] [ref] */,
 				       WERROR *werror)
 {
 	struct netr_ServerPasswordGet r;
@@ -1679,10 +1679,10 @@ NTSTATUS rpccli_netr_NETRLOGONSENDTOSAM(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_netr_DsRAddressToSitenamesW(struct rpc_pipe_client *cli,
 					    TALLOC_CTX *mem_ctx,
-					    const char *server_name,
-					    uint32_t count,
-					    struct netr_DsRAddress *addresses,
-					    struct netr_DsRAddressToSitenamesWCtr **ctr,
+					    const char *server_name /* [in] [unique,charset(UTF16)] */,
+					    uint32_t count /* [in] [range(0,32000)] */,
+					    struct netr_DsRAddress *addresses /* [in] [ref,size_is(count)] */,
+					    struct netr_DsRAddressToSitenamesWCtr **ctr /* [out] [ref] */,
 					    WERROR *werror)
 {
 	struct netr_DsRAddressToSitenamesW r;
@@ -1729,14 +1729,14 @@ NTSTATUS rpccli_netr_DsRAddressToSitenamesW(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_netr_DsRGetDCNameEx2(struct rpc_pipe_client *cli,
 				     TALLOC_CTX *mem_ctx,
-				     const char *server_unc,
-				     const char *client_account,
-				     uint32_t mask,
-				     const char *domain_name,
-				     struct GUID *domain_guid,
-				     const char *site_name,
-				     uint32_t flags,
-				     struct netr_DsRGetDCNameInfo **info,
+				     const char *server_unc /* [in] [unique,charset(UTF16)] */,
+				     const char *client_account /* [in] [unique,charset(UTF16)] */,
+				     uint32_t mask /* [in]  */,
+				     const char *domain_name /* [in] [unique,charset(UTF16)] */,
+				     struct GUID *domain_guid /* [in] [unique] */,
+				     const char *site_name /* [in] [unique,charset(UTF16)] */,
+				     uint32_t flags /* [in]  */,
+				     struct netr_DsRGetDCNameInfo **info /* [out] [ref] */,
 				     WERROR *werror)
 {
 	struct netr_DsRGetDCNameEx2 r;
@@ -1829,8 +1829,8 @@ NTSTATUS rpccli_netr_NETRLOGONGETTIMESERVICEPARENTDOMAIN(struct rpc_pipe_client
 
 NTSTATUS rpccli_netr_NetrEnumerateTrustedDomainsEx(struct rpc_pipe_client *cli,
 						   TALLOC_CTX *mem_ctx,
-						   const char *server_name,
-						   struct netr_DomainTrustList *dom_trust_list,
+						   const char *server_name /* [in] [unique,charset(UTF16)] */,
+						   struct netr_DomainTrustList *dom_trust_list /* [out] [ref] */,
 						   WERROR *werror)
 {
 	struct netr_NetrEnumerateTrustedDomainsEx r;
@@ -1875,10 +1875,10 @@ NTSTATUS rpccli_netr_NetrEnumerateTrustedDomainsEx(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_netr_DsRAddressToSitenamesExW(struct rpc_pipe_client *cli,
 					      TALLOC_CTX *mem_ctx,
-					      const char *server_name,
-					      uint32_t count,
-					      struct netr_DsRAddress *addresses,
-					      struct netr_DsRAddressToSitenamesExWCtr **ctr,
+					      const char *server_name /* [in] [unique,charset(UTF16)] */,
+					      uint32_t count /* [in] [range(0,32000)] */,
+					      struct netr_DsRAddress *addresses /* [in] [ref,size_is(count)] */,
+					      struct netr_DsRAddressToSitenamesExWCtr **ctr /* [out] [ref] */,
 					      WERROR *werror)
 {
 	struct netr_DsRAddressToSitenamesExW r;
@@ -1925,8 +1925,8 @@ NTSTATUS rpccli_netr_DsRAddressToSitenamesExW(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_netr_DsrGetDcSiteCoverageW(struct rpc_pipe_client *cli,
 					   TALLOC_CTX *mem_ctx,
-					   const char *server_name,
-					   struct DcSitesCtr *ctr,
+					   const char *server_name /* [in] [unique,charset(UTF16)] */,
+					   struct DcSitesCtr *ctr /* [out] [ref] */,
 					   WERROR *werror)
 {
 	struct netr_DsrGetDcSiteCoverageW r;
@@ -1971,14 +1971,14 @@ NTSTATUS rpccli_netr_DsrGetDcSiteCoverageW(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_netr_LogonSamLogonEx(struct rpc_pipe_client *cli,
 				     TALLOC_CTX *mem_ctx,
-				     const char *server_name,
-				     const char *computer_name,
-				     uint16_t logon_level,
-				     union netr_LogonLevel *logon,
-				     uint16_t validation_level,
-				     union netr_Validation *validation,
-				     uint8_t *authoritative,
-				     uint32_t *flags)
+				     const char *server_name /* [in] [unique,charset(UTF16)] */,
+				     const char *computer_name /* [in] [unique,charset(UTF16)] */,
+				     uint16_t logon_level /* [in]  */,
+				     union netr_LogonLevel *logon /* [in] [ref,switch_is(logon_level)] */,
+				     uint16_t validation_level /* [in]  */,
+				     union netr_Validation *validation /* [out] [ref,switch_is(validation_level)] */,
+				     uint8_t *authoritative /* [out] [ref] */,
+				     uint32_t *flags /* [in,out] [ref] */)
 {
 	struct netr_LogonSamLogonEx r;
 	NTSTATUS status;
@@ -2025,9 +2025,9 @@ NTSTATUS rpccli_netr_LogonSamLogonEx(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_netr_DsrEnumerateDomainTrusts(struct rpc_pipe_client *cli,
 					      TALLOC_CTX *mem_ctx,
-					      const char *server_name,
-					      uint32_t trust_flags,
-					      struct netr_DomainTrustList *trusts,
+					      const char *server_name /* [in] [unique,charset(UTF16)] */,
+					      uint32_t trust_flags /* [in]  */,
+					      struct netr_DomainTrustList *trusts /* [out] [ref] */,
 					      WERROR *werror)
 {
 	struct netr_DsrEnumerateDomainTrusts r;
@@ -2073,11 +2073,11 @@ NTSTATUS rpccli_netr_DsrEnumerateDomainTrusts(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_netr_DsrDeregisterDNSHostRecords(struct rpc_pipe_client *cli,
 						 TALLOC_CTX *mem_ctx,
-						 const char *server_name,
-						 const char *domain,
-						 struct GUID *domain_guid,
-						 struct GUID *dsa_guid,
-						 const char *dns_host,
+						 const char *server_name /* [in] [unique,charset(UTF16)] */,
+						 const char *domain /* [in] [unique,charset(UTF16)] */,
+						 struct GUID *domain_guid /* [in] [unique] */,
+						 struct GUID *dsa_guid /* [in] [unique] */,
+						 const char *dns_host /* [in] [ref,charset(UTF16)] */,
 						 WERROR *werror)
 {
 	struct netr_DsrDeregisterDNSHostRecords r;
@@ -2125,14 +2125,14 @@ NTSTATUS rpccli_netr_DsrDeregisterDNSHostRecords(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_netr_ServerTrustPasswordsGet(struct rpc_pipe_client *cli,
 					     TALLOC_CTX *mem_ctx,
-					     const char *server_name,
-					     const char *account_name,
-					     enum netr_SchannelType secure_channel_type,
-					     const char *computer_name,
-					     struct netr_Authenticator *credential,
-					     struct netr_Authenticator *return_authenticator,
-					     struct samr_Password *password,
-					     struct samr_Password *password2)
+					     const char *server_name /* [in] [unique,charset(UTF16)] */,
+					     const char *account_name /* [in] [charset(UTF16)] */,
+					     enum netr_SchannelType secure_channel_type /* [in]  */,
+					     const char *computer_name /* [in] [charset(UTF16)] */,
+					     struct netr_Authenticator *credential /* [in] [ref] */,
+					     struct netr_Authenticator *return_authenticator /* [out] [ref] */,
+					     struct samr_Password *password /* [out] [ref] */,
+					     struct samr_Password *password2 /* [out] [ref] */)
 {
 	struct netr_ServerTrustPasswordsGet r;
 	NTSTATUS status;
@@ -2178,10 +2178,10 @@ NTSTATUS rpccli_netr_ServerTrustPasswordsGet(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_netr_DsRGetForestTrustInformation(struct rpc_pipe_client *cli,
 						  TALLOC_CTX *mem_ctx,
-						  const char *server_name,
-						  const char *trusted_domain_name,
-						  uint32_t flags,
-						  struct lsa_ForestTrustInformation **forest_trust_info,
+						  const char *server_name /* [in] [unique,charset(UTF16)] */,
+						  const char *trusted_domain_name /* [in] [unique,charset(UTF16)] */,
+						  uint32_t flags /* [in]  */,
+						  struct lsa_ForestTrustInformation **forest_trust_info /* [out] [ref] */,
 						  WERROR *werror)
 {
 	struct netr_DsRGetForestTrustInformation r;
@@ -2228,12 +2228,12 @@ NTSTATUS rpccli_netr_DsRGetForestTrustInformation(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_netr_GetForestTrustInformation(struct rpc_pipe_client *cli,
 					       TALLOC_CTX *mem_ctx,
-					       const char *server_name,
-					       const char *trusted_domain_name,
-					       struct netr_Authenticator *credential,
-					       struct netr_Authenticator *return_authenticator,
-					       uint32_t flags,
-					       struct lsa_ForestTrustInformation **forest_trust_info,
+					       const char *server_name /* [in] [unique,charset(UTF16)] */,
+					       const char *trusted_domain_name /* [in] [ref,charset(UTF16)] */,
+					       struct netr_Authenticator *credential /* [in] [ref] */,
+					       struct netr_Authenticator *return_authenticator /* [out] [ref] */,
+					       uint32_t flags /* [in]  */,
+					       struct lsa_ForestTrustInformation **forest_trust_info /* [out] [ref] */,
 					       WERROR *werror)
 {
 	struct netr_GetForestTrustInformation r;
@@ -2282,16 +2282,16 @@ NTSTATUS rpccli_netr_GetForestTrustInformation(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_netr_LogonSamLogonWithFlags(struct rpc_pipe_client *cli,
 					    TALLOC_CTX *mem_ctx,
-					    const char *server_name,
-					    const char *computer_name,
-					    struct netr_Authenticator *credential,
-					    struct netr_Authenticator *return_authenticator,
-					    uint16_t logon_level,
-					    union netr_LogonLevel logon,
-					    uint16_t validation_level,
-					    union netr_Validation *validation,
-					    uint8_t *authoritative,
-					    uint32_t *flags)
+					    const char *server_name /* [in] [unique,charset(UTF16)] */,
+					    const char *computer_name /* [in] [unique,charset(UTF16)] */,
+					    struct netr_Authenticator *credential /* [in] [unique] */,
+					    struct netr_Authenticator *return_authenticator /* [in,out] [unique] */,
+					    uint16_t logon_level /* [in]  */,
+					    union netr_LogonLevel logon /* [in] [switch_is(logon_level)] */,
+					    uint16_t validation_level /* [in]  */,
+					    union netr_Validation *validation /* [out] [ref,switch_is(validation_level)] */,
+					    uint8_t *authoritative /* [out] [ref] */,
+					    uint32_t *flags /* [in,out] [ref] */)
 {
 	struct netr_LogonSamLogonWithFlags r;
 	NTSTATUS status;
diff --git a/source3/librpc/gen_ndr/cli_netlogon.h b/source3/librpc/gen_ndr/cli_netlogon.h
index 1fdc1f6c46..31171ffd7d 100644
--- a/source3/librpc/gen_ndr/cli_netlogon.h
+++ b/source3/librpc/gen_ndr/cli_netlogon.h
@@ -3,185 +3,185 @@
 #define __CLI_NETLOGON__
 NTSTATUS rpccli_netr_LogonUasLogon(struct rpc_pipe_client *cli,
 				   TALLOC_CTX *mem_ctx,
-				   const char *server_name,
-				   const char *account_name,
-				   const char *workstation,
-				   struct netr_UasInfo *info,
+				   const char *server_name /* [in] [unique,charset(UTF16)] */,
+				   const char *account_name /* [in] [charset(UTF16)] */,
+				   const char *workstation /* [in] [charset(UTF16)] */,
+				   struct netr_UasInfo *info /* [out] [ref] */,
 				   WERROR *werror);
 NTSTATUS rpccli_netr_LogonUasLogoff(struct rpc_pipe_client *cli,
 				    TALLOC_CTX *mem_ctx,
-				    const char *server_name,
-				    const char *account_name,
-				    const char *workstation,
-				    struct netr_UasLogoffInfo *info,
+				    const char *server_name /* [in] [unique,charset(UTF16)] */,
+				    const char *account_name /* [in] [charset(UTF16)] */,
+				    const char *workstation /* [in] [charset(UTF16)] */,
+				    struct netr_UasLogoffInfo *info /* [out] [ref] */,
 				    WERROR *werror);
 NTSTATUS rpccli_netr_LogonSamLogon(struct rpc_pipe_client *cli,
 				   TALLOC_CTX *mem_ctx,
-				   const char *server_name,
-				   const char *computer_name,
-				   struct netr_Authenticator *credential,
-				   struct netr_Authenticator *return_authenticator,
-				   uint16_t logon_level,
-				   union netr_LogonLevel *logon,
-				   uint16_t validation_level,
-				   union netr_Validation *validation,
-				   uint8_t *authoritative);
+				   const char *server_name /* [in] [unique,charset(UTF16)] */,
+				   const char *computer_name /* [in] [unique,charset(UTF16)] */,
+				   struct netr_Authenticator *credential /* [in] [unique] */,
+				   struct netr_Authenticator *return_authenticator /* [in,out] [unique] */,
+				   uint16_t logon_level /* [in]  */,
+				   union netr_LogonLevel *logon /* [in] [ref,switch_is(logon_level)] */,
+				   uint16_t validation_level /* [in]  */,
+				   union netr_Validation *validation /* [out] [ref,switch_is(validation_level)] */,
+				   uint8_t *authoritative /* [out] [ref] */);
 NTSTATUS rpccli_netr_LogonSamLogoff(struct rpc_pipe_client *cli,
 				    TALLOC_CTX *mem_ctx,
-				    const char *server_name,
-				    const char *computer_name,
-				    struct netr_Authenticator *credential,
-				    struct netr_Authenticator *return_authenticator,
-				    uint16_t logon_level,
-				    union netr_LogonLevel logon);
+				    const char *server_name /* [in] [unique,charset(UTF16)] */,
+				    const char *computer_name /* [in] [unique,charset(UTF16)] */,
+				    struct netr_Authenticator *credential /* [in] [unique] */,
+				    struct netr_Authenticator *return_authenticator /* [in,out] [unique] */,
+				    uint16_t logon_level /* [in]  */,
+				    union netr_LogonLevel logon /* [in] [switch_is(logon_level)] */);
 NTSTATUS rpccli_netr_ServerReqChallenge(struct rpc_pipe_client *cli,
 					TALLOC_CTX *mem_ctx,
-					const char *server_name,
-					const char *computer_name,
-					struct netr_Credential *credentials,
-					struct netr_Credential *return_credentials);
+					const char *server_name /* [in] [unique,charset(UTF16)] */,
+					const char *computer_name /* [in] [charset(UTF16)] */,
+					struct netr_Credential *credentials /* [in] [ref] */,
+					struct netr_Credential *return_credentials /* [out] [ref] */);
 NTSTATUS rpccli_netr_ServerAuthenticate(struct rpc_pipe_client *cli,
 					TALLOC_CTX *mem_ctx,
-					const char *server_name,
-					const char *account_name,
-					enum netr_SchannelType secure_channel_type,
-					const char *computer_name,
-					struct netr_Credential *credentials,
-					struct netr_Credential *return_credentials);
+					const char *server_name /* [in] [unique,charset(UTF16)] */,
+					const char *account_name /* [in] [charset(UTF16)] */,
+					enum netr_SchannelType secure_channel_type /* [in]  */,
+					const char *computer_name /* [in] [charset(UTF16)] */,
+					struct netr_Credential *credentials /* [in] [ref] */,
+					struct netr_Credential *return_credentials /* [out] [ref] */);
 NTSTATUS rpccli_netr_ServerPasswordSet(struct rpc_pipe_client *cli,
 				       TALLOC_CTX *mem_ctx,
-				       const char *server_name,
-				       const char *account_name,
-				       enum netr_SchannelType secure_channel_type,
-				       const char *computer_name,
-				       struct netr_Authenticator *credential,
-				       struct netr_Authenticator *return_authenticator,
-				       struct samr_Password *new_password);
+				       const char *server_name /* [in] [unique,charset(UTF16)] */,
+				       const char *account_name /* [in] [charset(UTF16)] */,
+				       enum netr_SchannelType secure_channel_type /* [in]  */,
+				       const char *computer_name /* [in] [charset(UTF16)] */,
+				       struct netr_Authenticator *credential /* [in] [ref] */,
+				       struct netr_Authenticator *return_authenticator /* [out] [ref] */,
+				       struct samr_Password *new_password /* [in] [ref] */);
 NTSTATUS rpccli_netr_DatabaseDeltas(struct rpc_pipe_client *cli,
 				    TALLOC_CTX *mem_ctx,
-				    const char *logon_server,
-				    const char *computername,
-				    struct netr_Authenticator *credential,
-				    struct netr_Authenticator *return_authenticator,
-				    enum netr_SamDatabaseID database_id,
-				    uint64_t *sequence_num,
-				    struct netr_DELTA_ENUM_ARRAY **delta_enum_array,
-				    uint32_t preferredmaximumlength);
+				    const char *logon_server /* [in] [charset(UTF16)] */,
+				    const char *computername /* [in] [charset(UTF16)] */,
+				    struct netr_Authenticator *credential /* [in] [ref] */,
+				    struct netr_Authenticator *return_authenticator /* [in,out] [ref] */,
+				    enum netr_SamDatabaseID database_id /* [in]  */,
+				    uint64_t *sequence_num /* [in,out] [ref] */,
+				    struct netr_DELTA_ENUM_ARRAY **delta_enum_array /* [out] [ref] */,
+				    uint32_t preferredmaximumlength /* [in]  */);
 NTSTATUS rpccli_netr_DatabaseSync(struct rpc_pipe_client *cli,
 				  TALLOC_CTX *mem_ctx,
-				  const char *logon_server,
-				  const char *computername,
-				  struct netr_Authenticator credential,
-				  struct netr_Authenticator *return_authenticator,
-				  enum netr_SamDatabaseID database_id,
-				  uint32_t *sync_context,
-				  uint32_t preferredmaximumlength,
-				  struct netr_DELTA_ENUM_ARRAY *delta_enum_array);
+				  const char *logon_server /* [in] [charset(UTF16)] */,
+				  const char *computername /* [in] [charset(UTF16)] */,
+				  struct netr_Authenticator credential /* [in]  */,
+				  struct netr_Authenticator *return_authenticator /* [in,out] [ref] */,
+				  enum netr_SamDatabaseID database_id /* [in]  */,
+				  uint32_t *sync_context /* [in,out] [ref] */,
+				  uint32_t preferredmaximumlength /* [in]  */,
+				  struct netr_DELTA_ENUM_ARRAY *delta_enum_array /* [out] [ref] */);
 NTSTATUS rpccli_netr_AccountDeltas(struct rpc_pipe_client *cli,
 				   TALLOC_CTX *mem_ctx,
-				   const char *logon_server,
-				   const char *computername,
-				   struct netr_Authenticator credential,
-				   struct netr_Authenticator *return_authenticator,
-				   struct netr_UAS_INFO_0 uas,
-				   uint32_t count,
-				   uint32_t level,
-				   uint32_t buffersize,
-				   struct netr_AccountBuffer *buffer,
-				   uint32_t *count_returned,
-				   uint32_t *total_entries,
-				   struct netr_UAS_INFO_0 *recordid);
+				   const char *logon_server /* [in] [unique,charset(UTF16)] */,
+				   const char *computername /* [in] [charset(UTF16)] */,
+				   struct netr_Authenticator credential /* [in]  */,
+				   struct netr_Authenticator *return_authenticator /* [in,out] [ref] */,
+				   struct netr_UAS_INFO_0 uas /* [in]  */,
+				   uint32_t count /* [in]  */,
+				   uint32_t level /* [in]  */,
+				   uint32_t buffersize /* [in]  */,
+				   struct netr_AccountBuffer *buffer /* [out] [ref,subcontext(4)] */,
+				   uint32_t *count_returned /* [out] [ref] */,
+				   uint32_t *total_entries /* [out] [ref] */,
+				   struct netr_UAS_INFO_0 *recordid /* [out] [ref] */);
 NTSTATUS rpccli_netr_AccountSync(struct rpc_pipe_client *cli,
 				 TALLOC_CTX *mem_ctx,
-				 const char *logon_server,
-				 const char *computername,
-				 struct netr_Authenticator credential,
-				 struct netr_Authenticator *return_authenticator,
-				 uint32_t reference,
-				 uint32_t level,
-				 uint32_t buffersize,
-				 struct netr_AccountBuffer *buffer,
-				 uint32_t *count_returned,
-				 uint32_t *total_entries,
-				 uint32_t *next_reference,
-				 struct netr_UAS_INFO_0 *recordid);
+				 const char *logon_server /* [in] [unique,charset(UTF16)] */,
+				 const char *computername /* [in] [charset(UTF16)] */,
+				 struct netr_Authenticator credential /* [in]  */,
+				 struct netr_Authenticator *return_authenticator /* [in,out] [ref] */,
+				 uint32_t reference /* [in]  */,
+				 uint32_t level /* [in]  */,
+				 uint32_t buffersize /* [in]  */,
+				 struct netr_AccountBuffer *buffer /* [out] [ref,subcontext(4)] */,
+				 uint32_t *count_returned /* [out] [ref] */,
+				 uint32_t *total_entries /* [out] [ref] */,
+				 uint32_t *next_reference /* [out] [ref] */,
+				 struct netr_UAS_INFO_0 *recordid /* [in,out] [ref] */);
 NTSTATUS rpccli_netr_GetDcName(struct rpc_pipe_client *cli,
 			       TALLOC_CTX *mem_ctx,
-			       const char *logon_server,
-			       const char *domainname,
-			       const char **dcname,
+			       const char *logon_server /* [in] [charset(UTF16)] */,
+			       const char *domainname /* [in] [unique,charset(UTF16)] */,
+			       const char **dcname /* [out] [ref,charset(UTF16)] */,
 			       WERROR *werror);
 NTSTATUS rpccli_netr_LogonControl(struct rpc_pipe_client *cli,
 				  TALLOC_CTX *mem_ctx,
-				  const char *logon_server,
-				  enum netr_LogonControlCode function_code,
-				  uint32_t level,
-				  union netr_CONTROL_QUERY_INFORMATION *info,
+				  const char *logon_server /* [in] [unique,charset(UTF16)] */,
+				  enum netr_LogonControlCode function_code /* [in]  */,
+				  uint32_t level /* [in]  */,
+				  union netr_CONTROL_QUERY_INFORMATION *info /* [out] [ref,switch_is(level)] */,
 				  WERROR *werror);
 NTSTATUS rpccli_netr_GetAnyDCName(struct rpc_pipe_client *cli,
 				  TALLOC_CTX *mem_ctx,
-				  const char *logon_server,
-				  const char *domainname,
-				  const char **dcname,
+				  const char *logon_server /* [in] [unique,charset(UTF16)] */,
+				  const char *domainname /* [in] [unique,charset(UTF16)] */,
+				  const char **dcname /* [out] [ref,charset(UTF16)] */,
 				  WERROR *werror);
 NTSTATUS rpccli_netr_LogonControl2(struct rpc_pipe_client *cli,
 				   TALLOC_CTX *mem_ctx,
-				   const char *logon_server,
-				   uint32_t function_code,
-				   uint32_t level,
-				   union netr_CONTROL_DATA_INFORMATION *data,
-				   union netr_CONTROL_QUERY_INFORMATION *query,
+				   const char *logon_server /* [in] [unique,charset(UTF16)] */,
+				   uint32_t function_code /* [in]  */,
+				   uint32_t level /* [in]  */,
+				   union netr_CONTROL_DATA_INFORMATION *data /* [in] [ref,switch_is(function_code)] */,
+				   union netr_CONTROL_QUERY_INFORMATION *query /* [out] [ref,switch_is(level)] */,
 				   WERROR *werror);
 NTSTATUS rpccli_netr_ServerAuthenticate2(struct rpc_pipe_client *cli,
 					 TALLOC_CTX *mem_ctx,
-					 const char *server_name,
-					 const char *account_name,
-					 enum netr_SchannelType secure_channel_type,
-					 const char *computer_name,
-					 struct netr_Credential *credentials,
-					 struct netr_Credential *return_credentials,
-					 uint32_t *negotiate_flags);
+					 const char *server_name /* [in] [unique,charset(UTF16)] */,
+					 const char *account_name /* [in] [charset(UTF16)] */,
+					 enum netr_SchannelType secure_channel_type /* [in]  */,
+					 const char *computer_name /* [in] [charset(UTF16)] */,
+					 struct netr_Credential *credentials /* [in] [ref] */,
+					 struct netr_Credential *return_credentials /* [out] [ref] */,
+					 uint32_t *negotiate_flags /* [in,out] [ref] */);
 NTSTATUS rpccli_netr_DatabaseSync2(struct rpc_pipe_client *cli,
 				   TALLOC_CTX *mem_ctx,
-				   const char *logon_server,
-				   const char *computername,
-				   struct netr_Authenticator *credential,
-				   struct netr_Authenticator *return_authenticator,
-				   enum netr_SamDatabaseID database_id,
-				   uint16_t restart_state,
-				   uint32_t *sync_context,
-				   struct netr_DELTA_ENUM_ARRAY **delta_enum_array,
-				   uint32_t preferredmaximumlength);
+				   const char *logon_server /* [in] [charset(UTF16)] */,
+				   const char *computername /* [in] [charset(UTF16)] */,
+				   struct netr_Authenticator *credential /* [in] [ref] */,
+				   struct netr_Authenticator *return_authenticator /* [in,out] [ref] */,
+				   enum netr_SamDatabaseID database_id /* [in]  */,
+				   uint16_t restart_state /* [in]  */,
+				   uint32_t *sync_context /* [in,out] [ref] */,
+				   struct netr_DELTA_ENUM_ARRAY **delta_enum_array /* [out] [ref] */,
+				   uint32_t preferredmaximumlength /* [in]  */);
 NTSTATUS rpccli_netr_DatabaseRedo(struct rpc_pipe_client *cli,
 				  TALLOC_CTX *mem_ctx,
-				  const char *logon_server,
-				  const char *computername,
-				  struct netr_Authenticator credential,
-				  struct netr_Authenticator *return_authenticator,
-				  uint8_t *change_log_entry,
-				  uint32_t change_log_entry_size,
-				  struct netr_DELTA_ENUM_ARRAY *delta_enum_array);
+				  const char *logon_server /* [in] [charset(UTF16)] */,
+				  const char *computername /* [in] [charset(UTF16)] */,
+				  struct netr_Authenticator credential /* [in]  */,
+				  struct netr_Authenticator *return_authenticator /* [in,out] [ref] */,
+				  uint8_t *change_log_entry /* [in] [unique,size_is(change_log_entry_size)] */,
+				  uint32_t change_log_entry_size /* [in]  */,
+				  struct netr_DELTA_ENUM_ARRAY *delta_enum_array /* [out] [ref] */);
 NTSTATUS rpccli_netr_LogonControl2Ex(struct rpc_pipe_client *cli,
 				     TALLOC_CTX *mem_ctx,
-				     const char *logon_server,
-				     uint32_t function_code,
-				     uint32_t level,
-				     union netr_CONTROL_DATA_INFORMATION data,
-				     union netr_CONTROL_QUERY_INFORMATION *query,
+				     const char *logon_server /* [in] [unique,charset(UTF16)] */,
+				     uint32_t function_code /* [in]  */,
+				     uint32_t level /* [in]  */,
+				     union netr_CONTROL_DATA_INFORMATION data /* [in] [switch_is(function_code)] */,
+				     union netr_CONTROL_QUERY_INFORMATION *query /* [out] [ref,switch_is(level)] */,
 				     WERROR *werror);
 NTSTATUS rpccli_netr_NetrEnumerateTrustedDomains(struct rpc_pipe_client *cli,
 						 TALLOC_CTX *mem_ctx,
-						 const char *server_name,
-						 struct netr_Blob *trusted_domains_blob,
+						 const char *server_name /* [in] [unique,charset(UTF16)] */,
+						 struct netr_Blob *trusted_domains_blob /* [out] [ref] */,
 						 WERROR *werror);
 NTSTATUS rpccli_netr_DsRGetDCName(struct rpc_pipe_client *cli,
 				  TALLOC_CTX *mem_ctx,
-				  const char *server_unc,
-				  const char *domain_name,
-				  struct GUID *domain_guid,
-				  struct GUID *site_guid,
-				  uint32_t flags,
-				  struct netr_DsRGetDCNameInfo **info,
+				  const char *server_unc /* [in] [unique,charset(UTF16)] */,
+				  const char *domain_name /* [in] [unique,charset(UTF16)] */,
+				  struct GUID *domain_guid /* [in] [unique] */,
+				  struct GUID *site_guid /* [in] [unique] */,
+				  uint32_t flags /* [in]  */,
+				  struct netr_DsRGetDCNameInfo **info /* [out] [ref] */,
 				  WERROR *werror);
 NTSTATUS rpccli_netr_NETRLOGONDUMMYROUTINE1(struct rpc_pipe_client *cli,
 					    TALLOC_CTX *mem_ctx,
@@ -191,9 +191,9 @@ NTSTATUS rpccli_netr_NETRLOGONSETSERVICEBITS(struct rpc_pipe_client *cli,
 					     WERROR *werror);
 NTSTATUS rpccli_netr_LogonGetTrustRid(struct rpc_pipe_client *cli,
 				      TALLOC_CTX *mem_ctx,
-				      const char *server_name,
-				      const char *domain_name,
-				      uint32_t *rid,
+				      const char *server_name /* [in] [unique,charset(UTF16)] */,
+				      const char *domain_name /* [in] [unique,charset(UTF16)] */,
+				      uint32_t *rid /* [out] [ref] */,
 				      WERROR *werror);
 NTSTATUS rpccli_netr_NETRLOGONCOMPUTESERVERDIGEST(struct rpc_pipe_client *cli,
 						  TALLOC_CTX *mem_ctx,
@@ -203,158 +203,158 @@ NTSTATUS rpccli_netr_NETRLOGONCOMPUTECLIENTDIGEST(struct rpc_pipe_client *cli,
 						  WERROR *werror);
 NTSTATUS rpccli_netr_ServerAuthenticate3(struct rpc_pipe_client *cli,
 					 TALLOC_CTX *mem_ctx,
-					 const char *server_name,
-					 const char *account_name,
-					 enum netr_SchannelType secure_channel_type,
-					 const char *computer_name,
-					 struct netr_Credential *credentials,
-					 uint32_t *negotiate_flags,
-					 uint32_t *rid);
+					 const char *server_name /* [in] [unique,charset(UTF16)] */,
+					 const char *account_name /* [in] [charset(UTF16)] */,
+					 enum netr_SchannelType secure_channel_type /* [in]  */,
+					 const char *computer_name /* [in] [charset(UTF16)] */,
+					 struct netr_Credential *credentials /* [in,out] [ref] */,
+					 uint32_t *negotiate_flags /* [in,out] [ref] */,
+					 uint32_t *rid /* [out] [ref] */);
 NTSTATUS rpccli_netr_DsRGetDCNameEx(struct rpc_pipe_client *cli,
 				    TALLOC_CTX *mem_ctx,
-				    const char *server_unc,
-				    const char *domain_name,
-				    struct GUID *domain_guid,
-				    const char *site_name,
-				    uint32_t flags,
-				    struct netr_DsRGetDCNameInfo **info,
+				    const char *server_unc /* [in] [unique,charset(UTF16)] */,
+				    const char *domain_name /* [in] [unique,charset(UTF16)] */,
+				    struct GUID *domain_guid /* [in] [unique] */,
+				    const char *site_name /* [in] [unique,charset(UTF16)] */,
+				    uint32_t flags /* [in]  */,
+				    struct netr_DsRGetDCNameInfo **info /* [out] [ref] */,
 				    WERROR *werror);
 NTSTATUS rpccli_netr_DsRGetSiteName(struct rpc_pipe_client *cli,
 				    TALLOC_CTX *mem_ctx,
-				    const char *computer_name,
-				    const char **site,
+				    const char *computer_name /* [in] [unique,charset(UTF16)] */,
+				    const char **site /* [out] [ref,charset(UTF16)] */,
 				    WERROR *werror);
 NTSTATUS rpccli_netr_LogonGetDomainInfo(struct rpc_pipe_client *cli,
 					TALLOC_CTX *mem_ctx,
-					const char *server_name,
-					const char *computer_name,
-					struct netr_Authenticator *credential,
-					struct netr_Authenticator *return_authenticator,
-					uint32_t level,
-					union netr_DomainQuery query,
-					union netr_DomainInfo *info);
+					const char *server_name /* [in] [charset(UTF16)] */,
+					const char *computer_name /* [in] [unique,charset(UTF16)] */,
+					struct netr_Authenticator *credential /* [in] [ref] */,
+					struct netr_Authenticator *return_authenticator /* [in,out] [ref] */,
+					uint32_t level /* [in]  */,
+					union netr_DomainQuery query /* [in] [switch_is(level)] */,
+					union netr_DomainInfo *info /* [out] [ref,switch_is(level)] */);
 NTSTATUS rpccli_netr_ServerPasswordSet2(struct rpc_pipe_client *cli,
 					TALLOC_CTX *mem_ctx,
-					const char *server_name,
-					const char *account_name,
-					enum netr_SchannelType secure_channel_type,
-					const char *computer_name,
-					struct netr_Authenticator credential,
-					struct netr_CryptPassword new_password,
-					struct netr_Authenticator *return_authenticator);
+					const char *server_name /* [in] [unique,charset(UTF16)] */,
+					const char *account_name /* [in] [charset(UTF16)] */,
+					enum netr_SchannelType secure_channel_type /* [in]  */,
+					const char *computer_name /* [in] [charset(UTF16)] */,
+					struct netr_Authenticator credential /* [in]  */,
+					struct netr_CryptPassword new_password /* [in]  */,
+					struct netr_Authenticator *return_authenticator /* [out] [ref] */);
 NTSTATUS rpccli_netr_ServerPasswordGet(struct rpc_pipe_client *cli,
 				       TALLOC_CTX *mem_ctx,
-				       const char *server_name,
-				       const char *account_name,
-				       enum netr_SchannelType secure_channel_type,
-				       const char *computer_name,
-				       struct netr_Authenticator *credential,
-				       struct netr_Authenticator *return_authenticator,
-				       struct samr_Password *password,
+				       const char *server_name /* [in] [unique,charset(UTF16)] */,
+				       const char *account_name /* [in] [charset(UTF16)] */,
+				       enum netr_SchannelType secure_channel_type /* [in]  */,
+				       const char *computer_name /* [in] [charset(UTF16)] */,
+				       struct netr_Authenticator *credential /* [in] [ref] */,
+				       struct netr_Authenticator *return_authenticator /* [out] [ref] */,
+				       struct samr_Password *password /* [out] [ref] */,
 				       WERROR *werror);
 NTSTATUS rpccli_netr_NETRLOGONSENDTOSAM(struct rpc_pipe_client *cli,
 					TALLOC_CTX *mem_ctx,
 					WERROR *werror);
 NTSTATUS rpccli_netr_DsRAddressToSitenamesW(struct rpc_pipe_client *cli,
 					    TALLOC_CTX *mem_ctx,
-					    const char *server_name,
-					    uint32_t count,
-					    struct netr_DsRAddress *addresses,
-					    struct netr_DsRAddressToSitenamesWCtr **ctr,
+					    const char *server_name /* [in] [unique,charset(UTF16)] */,
+					    uint32_t count /* [in] [range(0,32000)] */,
+					    struct netr_DsRAddress *addresses /* [in] [ref,size_is(count)] */,
+					    struct netr_DsRAddressToSitenamesWCtr **ctr /* [out] [ref] */,
 					    WERROR *werror);
 NTSTATUS rpccli_netr_DsRGetDCNameEx2(struct rpc_pipe_client *cli,
 				     TALLOC_CTX *mem_ctx,
-				     const char *server_unc,
-				     const char *client_account,
-				     uint32_t mask,
-				     const char *domain_name,
-				     struct GUID *domain_guid,
-				     const char *site_name,
-				     uint32_t flags,
-				     struct netr_DsRGetDCNameInfo **info,
+				     const char *server_unc /* [in] [unique,charset(UTF16)] */,
+				     const char *client_account /* [in] [unique,charset(UTF16)] */,
+				     uint32_t mask /* [in]  */,
+				     const char *domain_name /* [in] [unique,charset(UTF16)] */,
+				     struct GUID *domain_guid /* [in] [unique] */,
+				     const char *site_name /* [in] [unique,charset(UTF16)] */,
+				     uint32_t flags /* [in]  */,
+				     struct netr_DsRGetDCNameInfo **info /* [out] [ref] */,
 				     WERROR *werror);
 NTSTATUS rpccli_netr_NETRLOGONGETTIMESERVICEPARENTDOMAIN(struct rpc_pipe_client *cli,
 							 TALLOC_CTX *mem_ctx,
 							 WERROR *werror);
 NTSTATUS rpccli_netr_NetrEnumerateTrustedDomainsEx(struct rpc_pipe_client *cli,
 						   TALLOC_CTX *mem_ctx,
-						   const char *server_name,
-						   struct netr_DomainTrustList *dom_trust_list,
+						   const char *server_name /* [in] [unique,charset(UTF16)] */,
+						   struct netr_DomainTrustList *dom_trust_list /* [out] [ref] */,
 						   WERROR *werror);
 NTSTATUS rpccli_netr_DsRAddressToSitenamesExW(struct rpc_pipe_client *cli,
 					      TALLOC_CTX *mem_ctx,
-					      const char *server_name,
-					      uint32_t count,
-					      struct netr_DsRAddress *addresses,
-					      struct netr_DsRAddressToSitenamesExWCtr **ctr,
+					      const char *server_name /* [in] [unique,charset(UTF16)] */,
+					      uint32_t count /* [in] [range(0,32000)] */,
+					      struct netr_DsRAddress *addresses /* [in] [ref,size_is(count)] */,
+					      struct netr_DsRAddressToSitenamesExWCtr **ctr /* [out] [ref] */,
 					      WERROR *werror);
 NTSTATUS rpccli_netr_DsrGetDcSiteCoverageW(struct rpc_pipe_client *cli,
 					   TALLOC_CTX *mem_ctx,
-					   const char *server_name,
-					   struct DcSitesCtr *ctr,
+					   const char *server_name /* [in] [unique,charset(UTF16)] */,
+					   struct DcSitesCtr *ctr /* [out] [ref] */,
 					   WERROR *werror);
 NTSTATUS rpccli_netr_LogonSamLogonEx(struct rpc_pipe_client *cli,
 				     TALLOC_CTX *mem_ctx,
-				     const char *server_name,
-				     const char *computer_name,
-				     uint16_t logon_level,
-				     union netr_LogonLevel *logon,
-				     uint16_t validation_level,
-				     union netr_Validation *validation,
-				     uint8_t *authoritative,
-				     uint32_t *flags);
+				     const char *server_name /* [in] [unique,charset(UTF16)] */,
+				     const char *computer_name /* [in] [unique,charset(UTF16)] */,
+				     uint16_t logon_level /* [in]  */,
+				     union netr_LogonLevel *logon /* [in] [ref,switch_is(logon_level)] */,
+				     uint16_t validation_level /* [in]  */,
+				     union netr_Validation *validation /* [out] [ref,switch_is(validation_level)] */,
+				     uint8_t *authoritative /* [out] [ref] */,
+				     uint32_t *flags /* [in,out] [ref] */);
 NTSTATUS rpccli_netr_DsrEnumerateDomainTrusts(struct rpc_pipe_client *cli,
 					      TALLOC_CTX *mem_ctx,
-					      const char *server_name,
-					      uint32_t trust_flags,
-					      struct netr_DomainTrustList *trusts,
+					      const char *server_name /* [in] [unique,charset(UTF16)] */,
+					      uint32_t trust_flags /* [in]  */,
+					      struct netr_DomainTrustList *trusts /* [out] [ref] */,
 					      WERROR *werror);
 NTSTATUS rpccli_netr_DsrDeregisterDNSHostRecords(struct rpc_pipe_client *cli,
 						 TALLOC_CTX *mem_ctx,
-						 const char *server_name,
-						 const char *domain,
-						 struct GUID *domain_guid,
-						 struct GUID *dsa_guid,
-						 const char *dns_host,
+						 const char *server_name /* [in] [unique,charset(UTF16)] */,
+						 const char *domain /* [in] [unique,charset(UTF16)] */,
+						 struct GUID *domain_guid /* [in] [unique] */,
+						 struct GUID *dsa_guid /* [in] [unique] */,
+						 const char *dns_host /* [in] [ref,charset(UTF16)] */,
 						 WERROR *werror);
 NTSTATUS rpccli_netr_ServerTrustPasswordsGet(struct rpc_pipe_client *cli,
 					     TALLOC_CTX *mem_ctx,
-					     const char *server_name,
-					     const char *account_name,
-					     enum netr_SchannelType secure_channel_type,
-					     const char *computer_name,
-					     struct netr_Authenticator *credential,
-					     struct netr_Authenticator *return_authenticator,
-					     struct samr_Password *password,
-					     struct samr_Password *password2);
+					     const char *server_name /* [in] [unique,charset(UTF16)] */,
+					     const char *account_name /* [in] [charset(UTF16)] */,
+					     enum netr_SchannelType secure_channel_type /* [in]  */,
+					     const char *computer_name /* [in] [charset(UTF16)] */,
+					     struct netr_Authenticator *credential /* [in] [ref] */,
+					     struct netr_Authenticator *return_authenticator /* [out] [ref] */,
+					     struct samr_Password *password /* [out] [ref] */,
+					     struct samr_Password *password2 /* [out] [ref] */);
 NTSTATUS rpccli_netr_DsRGetForestTrustInformation(struct rpc_pipe_client *cli,
 						  TALLOC_CTX *mem_ctx,
-						  const char *server_name,
-						  const char *trusted_domain_name,
-						  uint32_t flags,
-						  struct lsa_ForestTrustInformation **forest_trust_info,
+						  const char *server_name /* [in] [unique,charset(UTF16)] */,
+						  const char *trusted_domain_name /* [in] [unique,charset(UTF16)] */,
+						  uint32_t flags /* [in]  */,
+						  struct lsa_ForestTrustInformation **forest_trust_info /* [out] [ref] */,
 						  WERROR *werror);
 NTSTATUS rpccli_netr_GetForestTrustInformation(struct rpc_pipe_client *cli,
 					       TALLOC_CTX *mem_ctx,
-					       const char *server_name,
-					       const char *trusted_domain_name,
-					       struct netr_Authenticator *credential,
-					       struct netr_Authenticator *return_authenticator,
-					       uint32_t flags,
-					       struct lsa_ForestTrustInformation **forest_trust_info,
+					       const char *server_name /* [in] [unique,charset(UTF16)] */,
+					       const char *trusted_domain_name /* [in] [ref,charset(UTF16)] */,
+					       struct netr_Authenticator *credential /* [in] [ref] */,
+					       struct netr_Authenticator *return_authenticator /* [out] [ref] */,
+					       uint32_t flags /* [in]  */,
+					       struct lsa_ForestTrustInformation **forest_trust_info /* [out] [ref] */,
 					       WERROR *werror);
 NTSTATUS rpccli_netr_LogonSamLogonWithFlags(struct rpc_pipe_client *cli,
 					    TALLOC_CTX *mem_ctx,
-					    const char *server_name,
-					    const char *computer_name,
-					    struct netr_Authenticator *credential,
-					    struct netr_Authenticator *return_authenticator,
-					    uint16_t logon_level,
-					    union netr_LogonLevel logon,
-					    uint16_t validation_level,
-					    union netr_Validation *validation,
-					    uint8_t *authoritative,
-					    uint32_t *flags);
+					    const char *server_name /* [in] [unique,charset(UTF16)] */,
+					    const char *computer_name /* [in] [unique,charset(UTF16)] */,
+					    struct netr_Authenticator *credential /* [in] [unique] */,
+					    struct netr_Authenticator *return_authenticator /* [in,out] [unique] */,
+					    uint16_t logon_level /* [in]  */,
+					    union netr_LogonLevel logon /* [in] [switch_is(logon_level)] */,
+					    uint16_t validation_level /* [in]  */,
+					    union netr_Validation *validation /* [out] [ref,switch_is(validation_level)] */,
+					    uint8_t *authoritative /* [out] [ref] */,
+					    uint32_t *flags /* [in,out] [ref] */);
 NTSTATUS rpccli_netr_NETRSERVERGETTRUSTINFO(struct rpc_pipe_client *cli,
 					    TALLOC_CTX *mem_ctx,
 					    WERROR *werror);
diff --git a/source3/librpc/gen_ndr/cli_ntsvcs.c b/source3/librpc/gen_ndr/cli_ntsvcs.c
index 5597fccdb5..615cdb64c9 100644
--- a/source3/librpc/gen_ndr/cli_ntsvcs.c
+++ b/source3/librpc/gen_ndr/cli_ntsvcs.c
@@ -92,7 +92,7 @@ NTSTATUS rpccli_PNP_Connect(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_PNP_GetVersion(struct rpc_pipe_client *cli,
 			       TALLOC_CTX *mem_ctx,
-			       uint16_t *version,
+			       uint16_t *version /* [out] [ref] */,
 			       WERROR *werror)
 {
 	struct PNP_GetVersion r;
@@ -262,8 +262,8 @@ NTSTATUS rpccli_PNP_ReportLogOn(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_PNP_ValidateDeviceInstance(struct rpc_pipe_client *cli,
 					   TALLOC_CTX *mem_ctx,
-					   const char *devicepath,
-					   uint32_t flags,
+					   const char *devicepath /* [in] [ref,charset(UTF16)] */,
+					   uint32_t flags /* [in]  */,
 					   WERROR *werror)
 {
 	struct PNP_ValidateDeviceInstance r;
@@ -476,9 +476,9 @@ NTSTATUS rpccli_PNP_GetDeviceList(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_PNP_GetDeviceListSize(struct rpc_pipe_client *cli,
 				      TALLOC_CTX *mem_ctx,
-				      const char *devicename,
-				      uint32_t *size,
-				      uint32_t flags,
+				      const char *devicename /* [in] [unique,charset(UTF16)] */,
+				      uint32_t *size /* [out] [ref] */,
+				      uint32_t flags /* [in]  */,
 				      WERROR *werror)
 {
 	struct PNP_GetDeviceListSize r;
@@ -1700,15 +1700,15 @@ NTSTATUS rpccli_PNP_RequestEjectPC(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_PNP_HwProfFlags(struct rpc_pipe_client *cli,
 				TALLOC_CTX *mem_ctx,
-				uint32_t unknown1,
-				const char *devicepath,
-				uint32_t unknown2,
-				uint32_t *unknown3,
-				uint16_t *unknown4,
-				const char *unknown5,
-				const char **unknown5a,
-				uint32_t unknown6,
-				uint32_t unknown7,
+				uint32_t unknown1 /* [in]  */,
+				const char *devicepath /* [in] [ref,charset(UTF16)] */,
+				uint32_t unknown2 /* [in]  */,
+				uint32_t *unknown3 /* [in,out] [ref] */,
+				uint16_t *unknown4 /* [in,out] [unique] */,
+				const char *unknown5 /* [in] [unique,charset(UTF16)] */,
+				const char **unknown5a /* [out] [unique,charset(UTF16)] */,
+				uint32_t unknown6 /* [in]  */,
+				uint32_t unknown7 /* [in]  */,
 				WERROR *werror)
 {
 	struct PNP_HwProfFlags r;
@@ -1766,10 +1766,10 @@ NTSTATUS rpccli_PNP_HwProfFlags(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_PNP_GetHwProfInfo(struct rpc_pipe_client *cli,
 				  TALLOC_CTX *mem_ctx,
-				  uint32_t idx,
-				  struct PNP_HwProfInfo *info,
-				  uint32_t unknown1,
-				  uint32_t unknown2,
+				  uint32_t idx /* [in]  */,
+				  struct PNP_HwProfInfo *info /* [in,out] [ref] */,
+				  uint32_t unknown1 /* [in]  */,
+				  uint32_t unknown2 /* [in]  */,
 				  WERROR *werror)
 {
 	struct PNP_GetHwProfInfo r;
diff --git a/source3/librpc/gen_ndr/cli_ntsvcs.h b/source3/librpc/gen_ndr/cli_ntsvcs.h
index 33df63ee5d..c20673f96b 100644
--- a/source3/librpc/gen_ndr/cli_ntsvcs.h
+++ b/source3/librpc/gen_ndr/cli_ntsvcs.h
@@ -9,7 +9,7 @@ NTSTATUS rpccli_PNP_Connect(struct rpc_pipe_client *cli,
 			    WERROR *werror);
 NTSTATUS rpccli_PNP_GetVersion(struct rpc_pipe_client *cli,
 			       TALLOC_CTX *mem_ctx,
-			       uint16_t *version,
+			       uint16_t *version /* [out] [ref] */,
 			       WERROR *werror);
 NTSTATUS rpccli_PNP_GetGlobalState(struct rpc_pipe_client *cli,
 				   TALLOC_CTX *mem_ctx,
@@ -22,8 +22,8 @@ NTSTATUS rpccli_PNP_ReportLogOn(struct rpc_pipe_client *cli,
 				WERROR *werror);
 NTSTATUS rpccli_PNP_ValidateDeviceInstance(struct rpc_pipe_client *cli,
 					   TALLOC_CTX *mem_ctx,
-					   const char *devicepath,
-					   uint32_t flags,
+					   const char *devicepath /* [in] [ref,charset(UTF16)] */,
+					   uint32_t flags /* [in]  */,
 					   WERROR *werror);
 NTSTATUS rpccli_PNP_GetRootDeviceInstance(struct rpc_pipe_client *cli,
 					  TALLOC_CTX *mem_ctx,
@@ -39,9 +39,9 @@ NTSTATUS rpccli_PNP_GetDeviceList(struct rpc_pipe_client *cli,
 				  WERROR *werror);
 NTSTATUS rpccli_PNP_GetDeviceListSize(struct rpc_pipe_client *cli,
 				      TALLOC_CTX *mem_ctx,
-				      const char *devicename,
-				      uint32_t *size,
-				      uint32_t flags,
+				      const char *devicename /* [in] [unique,charset(UTF16)] */,
+				      uint32_t *size /* [out] [ref] */,
+				      uint32_t flags /* [in]  */,
 				      WERROR *werror);
 NTSTATUS rpccli_PNP_GetDepth(struct rpc_pipe_client *cli,
 			     TALLOC_CTX *mem_ctx,
@@ -129,22 +129,22 @@ NTSTATUS rpccli_PNP_RequestEjectPC(struct rpc_pipe_client *cli,
 				   WERROR *werror);
 NTSTATUS rpccli_PNP_HwProfFlags(struct rpc_pipe_client *cli,
 				TALLOC_CTX *mem_ctx,
-				uint32_t unknown1,
-				const char *devicepath,
-				uint32_t unknown2,
-				uint32_t *unknown3,
-				uint16_t *unknown4,
-				const char *unknown5,
-				const char **unknown5a,
-				uint32_t unknown6,
-				uint32_t unknown7,
+				uint32_t unknown1 /* [in]  */,
+				const char *devicepath /* [in] [ref,charset(UTF16)] */,
+				uint32_t unknown2 /* [in]  */,
+				uint32_t *unknown3 /* [in,out] [ref] */,
+				uint16_t *unknown4 /* [in,out] [unique] */,
+				const char *unknown5 /* [in] [unique,charset(UTF16)] */,
+				const char **unknown5a /* [out] [unique,charset(UTF16)] */,
+				uint32_t unknown6 /* [in]  */,
+				uint32_t unknown7 /* [in]  */,
 				WERROR *werror);
 NTSTATUS rpccli_PNP_GetHwProfInfo(struct rpc_pipe_client *cli,
 				  TALLOC_CTX *mem_ctx,
-				  uint32_t idx,
-				  struct PNP_HwProfInfo *info,
-				  uint32_t unknown1,
-				  uint32_t unknown2,
+				  uint32_t idx /* [in]  */,
+				  struct PNP_HwProfInfo *info /* [in,out] [ref] */,
+				  uint32_t unknown1 /* [in]  */,
+				  uint32_t unknown2 /* [in]  */,
 				  WERROR *werror);
 NTSTATUS rpccli_PNP_AddEmptyLogConf(struct rpc_pipe_client *cli,
 				    TALLOC_CTX *mem_ctx,
diff --git a/source3/librpc/gen_ndr/cli_samr.c b/source3/librpc/gen_ndr/cli_samr.c
index 663d620d67..bdc9837018 100644
--- a/source3/librpc/gen_ndr/cli_samr.c
+++ b/source3/librpc/gen_ndr/cli_samr.c
@@ -8,9 +8,9 @@
 
 NTSTATUS rpccli_samr_Connect(struct rpc_pipe_client *cli,
 			     TALLOC_CTX *mem_ctx,
-			     uint16_t *system_name,
-			     uint32_t access_mask,
-			     struct policy_handle *connect_handle)
+			     uint16_t *system_name /* [in] [unique] */,
+			     uint32_t access_mask /* [in]  */,
+			     struct policy_handle *connect_handle /* [out] [ref] */)
 {
 	struct samr_Connect r;
 	NTSTATUS status;
@@ -51,7 +51,7 @@ NTSTATUS rpccli_samr_Connect(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_samr_Close(struct rpc_pipe_client *cli,
 			   TALLOC_CTX *mem_ctx,
-			   struct policy_handle *handle)
+			   struct policy_handle *handle /* [in,out] [ref] */)
 {
 	struct samr_Close r;
 	NTSTATUS status;
@@ -91,9 +91,9 @@ NTSTATUS rpccli_samr_Close(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_samr_SetSecurity(struct rpc_pipe_client *cli,
 				 TALLOC_CTX *mem_ctx,
-				 struct policy_handle *handle,
-				 uint32_t sec_info,
-				 struct sec_desc_buf *sdbuf)
+				 struct policy_handle *handle /* [in] [ref] */,
+				 uint32_t sec_info /* [in]  */,
+				 struct sec_desc_buf *sdbuf /* [in] [ref] */)
 {
 	struct samr_SetSecurity r;
 	NTSTATUS status;
@@ -134,9 +134,9 @@ NTSTATUS rpccli_samr_SetSecurity(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_samr_QuerySecurity(struct rpc_pipe_client *cli,
 				   TALLOC_CTX *mem_ctx,
-				   struct policy_handle *handle,
-				   uint32_t sec_info,
-				   struct sec_desc_buf **sdbuf)
+				   struct policy_handle *handle /* [in] [ref] */,
+				   uint32_t sec_info /* [in]  */,
+				   struct sec_desc_buf **sdbuf /* [out] [ref] */)
 {
 	struct samr_QuerySecurity r;
 	NTSTATUS status;
@@ -177,7 +177,7 @@ NTSTATUS rpccli_samr_QuerySecurity(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_samr_Shutdown(struct rpc_pipe_client *cli,
 			      TALLOC_CTX *mem_ctx,
-			      struct policy_handle *connect_handle)
+			      struct policy_handle *connect_handle /* [in] [ref] */)
 {
 	struct samr_Shutdown r;
 	NTSTATUS status;
@@ -216,9 +216,9 @@ NTSTATUS rpccli_samr_Shutdown(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_samr_LookupDomain(struct rpc_pipe_client *cli,
 				  TALLOC_CTX *mem_ctx,
-				  struct policy_handle *connect_handle,
-				  struct lsa_String *domain_name,
-				  struct dom_sid2 **sid)
+				  struct policy_handle *connect_handle /* [in] [ref] */,
+				  struct lsa_String *domain_name /* [in] [ref] */,
+				  struct dom_sid2 **sid /* [out] [ref] */)
 {
 	struct samr_LookupDomain r;
 	NTSTATUS status;
@@ -259,11 +259,11 @@ NTSTATUS rpccli_samr_LookupDomain(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_samr_EnumDomains(struct rpc_pipe_client *cli,
 				 TALLOC_CTX *mem_ctx,
-				 struct policy_handle *connect_handle,
-				 uint32_t *resume_handle,
-				 struct samr_SamArray **sam,
-				 uint32_t buf_size,
-				 uint32_t *num_entries)
+				 struct policy_handle *connect_handle /* [in] [ref] */,
+				 uint32_t *resume_handle /* [in,out] [ref] */,
+				 struct samr_SamArray **sam /* [out] [ref] */,
+				 uint32_t buf_size /* [in]  */,
+				 uint32_t *num_entries /* [out] [ref] */)
 {
 	struct samr_EnumDomains r;
 	NTSTATUS status;
@@ -307,10 +307,10 @@ NTSTATUS rpccli_samr_EnumDomains(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_samr_OpenDomain(struct rpc_pipe_client *cli,
 				TALLOC_CTX *mem_ctx,
-				struct policy_handle *connect_handle,
-				uint32_t access_mask,
-				struct dom_sid2 *sid,
-				struct policy_handle *domain_handle)
+				struct policy_handle *connect_handle /* [in] [ref] */,
+				uint32_t access_mask /* [in]  */,
+				struct dom_sid2 *sid /* [in] [ref] */,
+				struct policy_handle *domain_handle /* [out] [ref] */)
 {
 	struct samr_OpenDomain r;
 	NTSTATUS status;
@@ -352,9 +352,9 @@ NTSTATUS rpccli_samr_OpenDomain(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_samr_QueryDomainInfo(struct rpc_pipe_client *cli,
 				     TALLOC_CTX *mem_ctx,
-				     struct policy_handle *domain_handle,
-				     uint16_t level,
-				     union samr_DomainInfo **info)
+				     struct policy_handle *domain_handle /* [in] [ref] */,
+				     uint16_t level /* [in]  */,
+				     union samr_DomainInfo **info /* [out] [ref,switch_is(level)] */)
 {
 	struct samr_QueryDomainInfo r;
 	NTSTATUS status;
@@ -395,9 +395,9 @@ NTSTATUS rpccli_samr_QueryDomainInfo(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_samr_SetDomainInfo(struct rpc_pipe_client *cli,
 				   TALLOC_CTX *mem_ctx,
-				   struct policy_handle *domain_handle,
-				   uint16_t level,
-				   union samr_DomainInfo *info)
+				   struct policy_handle *domain_handle /* [in] [ref] */,
+				   uint16_t level /* [in]  */,
+				   union samr_DomainInfo *info /* [in] [ref,switch_is(level)] */)
 {
 	struct samr_SetDomainInfo r;
 	NTSTATUS status;
@@ -438,11 +438,11 @@ NTSTATUS rpccli_samr_SetDomainInfo(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_samr_CreateDomainGroup(struct rpc_pipe_client *cli,
 				       TALLOC_CTX *mem_ctx,
-				       struct policy_handle *domain_handle,
-				       struct lsa_String *name,
-				       uint32_t access_mask,
-				       struct policy_handle *group_handle,
-				       uint32_t *rid)
+				       struct policy_handle *domain_handle /* [in] [ref] */,
+				       struct lsa_String *name /* [in] [ref] */,
+				       uint32_t access_mask /* [in]  */,
+				       struct policy_handle *group_handle /* [out] [ref] */,
+				       uint32_t *rid /* [out] [ref] */)
 {
 	struct samr_CreateDomainGroup r;
 	NTSTATUS status;
@@ -485,11 +485,11 @@ NTSTATUS rpccli_samr_CreateDomainGroup(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_samr_EnumDomainGroups(struct rpc_pipe_client *cli,
 				      TALLOC_CTX *mem_ctx,
-				      struct policy_handle *domain_handle,
-				      uint32_t *resume_handle,
-				      struct samr_SamArray **sam,
-				      uint32_t max_size,
-				      uint32_t *num_entries)
+				      struct policy_handle *domain_handle /* [in] [ref] */,
+				      uint32_t *resume_handle /* [in,out] [ref] */,
+				      struct samr_SamArray **sam /* [out] [ref] */,
+				      uint32_t max_size /* [in]  */,
+				      uint32_t *num_entries /* [out] [ref] */)
 {
 	struct samr_EnumDomainGroups r;
 	NTSTATUS status;
@@ -533,11 +533,11 @@ NTSTATUS rpccli_samr_EnumDomainGroups(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_samr_CreateUser(struct rpc_pipe_client *cli,
 				TALLOC_CTX *mem_ctx,
-				struct policy_handle *domain_handle,
-				struct lsa_String *account_name,
-				uint32_t access_mask,
-				struct policy_handle *user_handle,
-				uint32_t *rid)
+				struct policy_handle *domain_handle /* [in] [ref] */,
+				struct lsa_String *account_name /* [in] [ref] */,
+				uint32_t access_mask /* [in]  */,
+				struct policy_handle *user_handle /* [out] [ref] */,
+				uint32_t *rid /* [out] [ref] */)
 {
 	struct samr_CreateUser r;
 	NTSTATUS status;
@@ -580,12 +580,12 @@ NTSTATUS rpccli_samr_CreateUser(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_samr_EnumDomainUsers(struct rpc_pipe_client *cli,
 				     TALLOC_CTX *mem_ctx,
-				     struct policy_handle *domain_handle,
-				     uint32_t *resume_handle,
-				     uint32_t acct_flags,
-				     struct samr_SamArray **sam,
-				     uint32_t max_size,
-				     uint32_t *num_entries)
+				     struct policy_handle *domain_handle /* [in] [ref] */,
+				     uint32_t *resume_handle /* [in,out] [ref] */,
+				     uint32_t acct_flags /* [in]  */,
+				     struct samr_SamArray **sam /* [out] [ref] */,
+				     uint32_t max_size /* [in]  */,
+				     uint32_t *num_entries /* [out] [ref] */)
 {
 	struct samr_EnumDomainUsers r;
 	NTSTATUS status;
@@ -630,11 +630,11 @@ NTSTATUS rpccli_samr_EnumDomainUsers(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_samr_CreateDomAlias(struct rpc_pipe_client *cli,
 				    TALLOC_CTX *mem_ctx,
-				    struct policy_handle *domain_handle,
-				    struct lsa_String *alias_name,
-				    uint32_t access_mask,
-				    struct policy_handle *alias_handle,
-				    uint32_t *rid)
+				    struct policy_handle *domain_handle /* [in] [ref] */,
+				    struct lsa_String *alias_name /* [in] [ref] */,
+				    uint32_t access_mask /* [in]  */,
+				    struct policy_handle *alias_handle /* [out] [ref] */,
+				    uint32_t *rid /* [out] [ref] */)
 {
 	struct samr_CreateDomAlias r;
 	NTSTATUS status;
@@ -677,11 +677,11 @@ NTSTATUS rpccli_samr_CreateDomAlias(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_samr_EnumDomainAliases(struct rpc_pipe_client *cli,
 				       TALLOC_CTX *mem_ctx,
-				       struct policy_handle *domain_handle,
-				       uint32_t *resume_handle,
-				       struct samr_SamArray **sam,
-				       uint32_t max_size,
-				       uint32_t *num_entries)
+				       struct policy_handle *domain_handle /* [in] [ref] */,
+				       uint32_t *resume_handle /* [in,out] [ref] */,
+				       struct samr_SamArray **sam /* [out] [ref] */,
+				       uint32_t max_size /* [in]  */,
+				       uint32_t *num_entries /* [out] [ref] */)
 {
 	struct samr_EnumDomainAliases r;
 	NTSTATUS status;
@@ -725,9 +725,9 @@ NTSTATUS rpccli_samr_EnumDomainAliases(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_samr_GetAliasMembership(struct rpc_pipe_client *cli,
 					TALLOC_CTX *mem_ctx,
-					struct policy_handle *domain_handle,
-					struct lsa_SidArray *sids,
-					struct samr_Ids *rids)
+					struct policy_handle *domain_handle /* [in] [ref] */,
+					struct lsa_SidArray *sids /* [in] [ref] */,
+					struct samr_Ids *rids /* [out] [ref] */)
 {
 	struct samr_GetAliasMembership r;
 	NTSTATUS status;
@@ -768,11 +768,11 @@ NTSTATUS rpccli_samr_GetAliasMembership(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_samr_LookupNames(struct rpc_pipe_client *cli,
 				 TALLOC_CTX *mem_ctx,
-				 struct policy_handle *domain_handle,
-				 uint32_t num_names,
-				 struct lsa_String *names,
-				 struct samr_Ids *rids,
-				 struct samr_Ids *types)
+				 struct policy_handle *domain_handle /* [in] [ref] */,
+				 uint32_t num_names /* [in] [range(0,1000)] */,
+				 struct lsa_String *names /* [in] [length_is(num_names),size_is(1000)] */,
+				 struct samr_Ids *rids /* [out] [ref] */,
+				 struct samr_Ids *types /* [out] [ref] */)
 {
 	struct samr_LookupNames r;
 	NTSTATUS status;
@@ -815,11 +815,11 @@ NTSTATUS rpccli_samr_LookupNames(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_samr_LookupRids(struct rpc_pipe_client *cli,
 				TALLOC_CTX *mem_ctx,
-				struct policy_handle *domain_handle,
-				uint32_t num_rids,
-				uint32_t *rids,
-				struct lsa_Strings *names,
-				struct samr_Ids *types)
+				struct policy_handle *domain_handle /* [in] [ref] */,
+				uint32_t num_rids /* [in] [range(0,1000)] */,
+				uint32_t *rids /* [in] [length_is(num_rids),size_is(1000)] */,
+				struct lsa_Strings *names /* [out] [ref] */,
+				struct samr_Ids *types /* [out] [ref] */)
 {
 	struct samr_LookupRids r;
 	NTSTATUS status;
@@ -862,10 +862,10 @@ NTSTATUS rpccli_samr_LookupRids(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_samr_OpenGroup(struct rpc_pipe_client *cli,
 			       TALLOC_CTX *mem_ctx,
-			       struct policy_handle *domain_handle,
-			       uint32_t access_mask,
-			       uint32_t rid,
-			       struct policy_handle *group_handle)
+			       struct policy_handle *domain_handle /* [in] [ref] */,
+			       uint32_t access_mask /* [in]  */,
+			       uint32_t rid /* [in]  */,
+			       struct policy_handle *group_handle /* [out] [ref] */)
 {
 	struct samr_OpenGroup r;
 	NTSTATUS status;
@@ -907,9 +907,9 @@ NTSTATUS rpccli_samr_OpenGroup(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_samr_QueryGroupInfo(struct rpc_pipe_client *cli,
 				    TALLOC_CTX *mem_ctx,
-				    struct policy_handle *group_handle,
-				    enum samr_GroupInfoEnum level,
-				    union samr_GroupInfo **info)
+				    struct policy_handle *group_handle /* [in] [ref] */,
+				    enum samr_GroupInfoEnum level /* [in]  */,
+				    union samr_GroupInfo **info /* [out] [ref,switch_is(level)] */)
 {
 	struct samr_QueryGroupInfo r;
 	NTSTATUS status;
@@ -950,9 +950,9 @@ NTSTATUS rpccli_samr_QueryGroupInfo(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_samr_SetGroupInfo(struct rpc_pipe_client *cli,
 				  TALLOC_CTX *mem_ctx,
-				  struct policy_handle *group_handle,
-				  enum samr_GroupInfoEnum level,
-				  union samr_GroupInfo *info)
+				  struct policy_handle *group_handle /* [in] [ref] */,
+				  enum samr_GroupInfoEnum level /* [in]  */,
+				  union samr_GroupInfo *info /* [in] [ref,switch_is(level)] */)
 {
 	struct samr_SetGroupInfo r;
 	NTSTATUS status;
@@ -993,9 +993,9 @@ NTSTATUS rpccli_samr_SetGroupInfo(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_samr_AddGroupMember(struct rpc_pipe_client *cli,
 				    TALLOC_CTX *mem_ctx,
-				    struct policy_handle *group_handle,
-				    uint32_t rid,
-				    uint32_t flags)
+				    struct policy_handle *group_handle /* [in] [ref] */,
+				    uint32_t rid /* [in]  */,
+				    uint32_t flags /* [in]  */)
 {
 	struct samr_AddGroupMember r;
 	NTSTATUS status;
@@ -1036,7 +1036,7 @@ NTSTATUS rpccli_samr_AddGroupMember(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_samr_DeleteDomainGroup(struct rpc_pipe_client *cli,
 				       TALLOC_CTX *mem_ctx,
-				       struct policy_handle *group_handle)
+				       struct policy_handle *group_handle /* [in,out] [ref] */)
 {
 	struct samr_DeleteDomainGroup r;
 	NTSTATUS status;
@@ -1076,8 +1076,8 @@ NTSTATUS rpccli_samr_DeleteDomainGroup(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_samr_DeleteGroupMember(struct rpc_pipe_client *cli,
 				       TALLOC_CTX *mem_ctx,
-				       struct policy_handle *group_handle,
-				       uint32_t rid)
+				       struct policy_handle *group_handle /* [in] [ref] */,
+				       uint32_t rid /* [in]  */)
 {
 	struct samr_DeleteGroupMember r;
 	NTSTATUS status;
@@ -1117,8 +1117,8 @@ NTSTATUS rpccli_samr_DeleteGroupMember(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_samr_QueryGroupMember(struct rpc_pipe_client *cli,
 				      TALLOC_CTX *mem_ctx,
-				      struct policy_handle *group_handle,
-				      struct samr_RidTypeArray **rids)
+				      struct policy_handle *group_handle /* [in] [ref] */,
+				      struct samr_RidTypeArray **rids /* [out] [ref] */)
 {
 	struct samr_QueryGroupMember r;
 	NTSTATUS status;
@@ -1158,9 +1158,9 @@ NTSTATUS rpccli_samr_QueryGroupMember(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_samr_SetMemberAttributesOfGroup(struct rpc_pipe_client *cli,
 						TALLOC_CTX *mem_ctx,
-						struct policy_handle *group_handle,
-						uint32_t unknown1,
-						uint32_t unknown2)
+						struct policy_handle *group_handle /* [in] [ref] */,
+						uint32_t unknown1 /* [in]  */,
+						uint32_t unknown2 /* [in]  */)
 {
 	struct samr_SetMemberAttributesOfGroup r;
 	NTSTATUS status;
@@ -1201,10 +1201,10 @@ NTSTATUS rpccli_samr_SetMemberAttributesOfGroup(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_samr_OpenAlias(struct rpc_pipe_client *cli,
 			       TALLOC_CTX *mem_ctx,
-			       struct policy_handle *domain_handle,
-			       uint32_t access_mask,
-			       uint32_t rid,
-			       struct policy_handle *alias_handle)
+			       struct policy_handle *domain_handle /* [in] [ref] */,
+			       uint32_t access_mask /* [in]  */,
+			       uint32_t rid /* [in]  */,
+			       struct policy_handle *alias_handle /* [out] [ref] */)
 {
 	struct samr_OpenAlias r;
 	NTSTATUS status;
@@ -1246,9 +1246,9 @@ NTSTATUS rpccli_samr_OpenAlias(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_samr_QueryAliasInfo(struct rpc_pipe_client *cli,
 				    TALLOC_CTX *mem_ctx,
-				    struct policy_handle *alias_handle,
-				    enum samr_AliasInfoEnum level,
-				    union samr_AliasInfo **info)
+				    struct policy_handle *alias_handle /* [in] [ref] */,
+				    enum samr_AliasInfoEnum level /* [in]  */,
+				    union samr_AliasInfo **info /* [out] [ref,switch_is(level)] */)
 {
 	struct samr_QueryAliasInfo r;
 	NTSTATUS status;
@@ -1289,9 +1289,9 @@ NTSTATUS rpccli_samr_QueryAliasInfo(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_samr_SetAliasInfo(struct rpc_pipe_client *cli,
 				  TALLOC_CTX *mem_ctx,
-				  struct policy_handle *alias_handle,
-				  enum samr_AliasInfoEnum level,
-				  union samr_AliasInfo *info)
+				  struct policy_handle *alias_handle /* [in] [ref] */,
+				  enum samr_AliasInfoEnum level /* [in]  */,
+				  union samr_AliasInfo *info /* [in] [ref,switch_is(level)] */)
 {
 	struct samr_SetAliasInfo r;
 	NTSTATUS status;
@@ -1332,7 +1332,7 @@ NTSTATUS rpccli_samr_SetAliasInfo(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_samr_DeleteDomAlias(struct rpc_pipe_client *cli,
 				    TALLOC_CTX *mem_ctx,
-				    struct policy_handle *alias_handle)
+				    struct policy_handle *alias_handle /* [in,out] [ref] */)
 {
 	struct samr_DeleteDomAlias r;
 	NTSTATUS status;
@@ -1372,8 +1372,8 @@ NTSTATUS rpccli_samr_DeleteDomAlias(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_samr_AddAliasMember(struct rpc_pipe_client *cli,
 				    TALLOC_CTX *mem_ctx,
-				    struct policy_handle *alias_handle,
-				    struct dom_sid2 *sid)
+				    struct policy_handle *alias_handle /* [in] [ref] */,
+				    struct dom_sid2 *sid /* [in] [ref] */)
 {
 	struct samr_AddAliasMember r;
 	NTSTATUS status;
@@ -1413,8 +1413,8 @@ NTSTATUS rpccli_samr_AddAliasMember(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_samr_DeleteAliasMember(struct rpc_pipe_client *cli,
 				       TALLOC_CTX *mem_ctx,
-				       struct policy_handle *alias_handle,
-				       struct dom_sid2 *sid)
+				       struct policy_handle *alias_handle /* [in] [ref] */,
+				       struct dom_sid2 *sid /* [in] [ref] */)
 {
 	struct samr_DeleteAliasMember r;
 	NTSTATUS status;
@@ -1454,8 +1454,8 @@ NTSTATUS rpccli_samr_DeleteAliasMember(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_samr_GetMembersInAlias(struct rpc_pipe_client *cli,
 				       TALLOC_CTX *mem_ctx,
-				       struct policy_handle *alias_handle,
-				       struct lsa_SidArray *sids)
+				       struct policy_handle *alias_handle /* [in] [ref] */,
+				       struct lsa_SidArray *sids /* [out] [ref] */)
 {
 	struct samr_GetMembersInAlias r;
 	NTSTATUS status;
@@ -1495,10 +1495,10 @@ NTSTATUS rpccli_samr_GetMembersInAlias(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_samr_OpenUser(struct rpc_pipe_client *cli,
 			      TALLOC_CTX *mem_ctx,
-			      struct policy_handle *domain_handle,
-			      uint32_t access_mask,
-			      uint32_t rid,
-			      struct policy_handle *user_handle)
+			      struct policy_handle *domain_handle /* [in] [ref] */,
+			      uint32_t access_mask /* [in]  */,
+			      uint32_t rid /* [in]  */,
+			      struct policy_handle *user_handle /* [out] [ref] */)
 {
 	struct samr_OpenUser r;
 	NTSTATUS status;
@@ -1540,7 +1540,7 @@ NTSTATUS rpccli_samr_OpenUser(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_samr_DeleteUser(struct rpc_pipe_client *cli,
 				TALLOC_CTX *mem_ctx,
-				struct policy_handle *user_handle)
+				struct policy_handle *user_handle /* [in,out] [ref] */)
 {
 	struct samr_DeleteUser r;
 	NTSTATUS status;
@@ -1580,9 +1580,9 @@ NTSTATUS rpccli_samr_DeleteUser(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_samr_QueryUserInfo(struct rpc_pipe_client *cli,
 				   TALLOC_CTX *mem_ctx,
-				   struct policy_handle *user_handle,
-				   uint16_t level,
-				   union samr_UserInfo **info)
+				   struct policy_handle *user_handle /* [in] [ref] */,
+				   uint16_t level /* [in]  */,
+				   union samr_UserInfo **info /* [out] [ref,switch_is(level)] */)
 {
 	struct samr_QueryUserInfo r;
 	NTSTATUS status;
@@ -1623,9 +1623,9 @@ NTSTATUS rpccli_samr_QueryUserInfo(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_samr_SetUserInfo(struct rpc_pipe_client *cli,
 				 TALLOC_CTX *mem_ctx,
-				 struct policy_handle *user_handle,
-				 uint16_t level,
-				 union samr_UserInfo *info)
+				 struct policy_handle *user_handle /* [in] [ref] */,
+				 uint16_t level /* [in]  */,
+				 union samr_UserInfo *info /* [in] [ref,switch_is(level)] */)
 {
 	struct samr_SetUserInfo r;
 	NTSTATUS status;
@@ -1666,17 +1666,17 @@ NTSTATUS rpccli_samr_SetUserInfo(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_samr_ChangePasswordUser(struct rpc_pipe_client *cli,
 					TALLOC_CTX *mem_ctx,
-					struct policy_handle *user_handle,
-					uint8_t lm_present,
-					struct samr_Password *old_lm_crypted,
-					struct samr_Password *new_lm_crypted,
-					uint8_t nt_present,
-					struct samr_Password *old_nt_crypted,
-					struct samr_Password *new_nt_crypted,
-					uint8_t cross1_present,
-					struct samr_Password *nt_cross,
-					uint8_t cross2_present,
-					struct samr_Password *lm_cross)
+					struct policy_handle *user_handle /* [in] [ref] */,
+					uint8_t lm_present /* [in]  */,
+					struct samr_Password *old_lm_crypted /* [in] [unique] */,
+					struct samr_Password *new_lm_crypted /* [in] [unique] */,
+					uint8_t nt_present /* [in]  */,
+					struct samr_Password *old_nt_crypted /* [in] [unique] */,
+					struct samr_Password *new_nt_crypted /* [in] [unique] */,
+					uint8_t cross1_present /* [in]  */,
+					struct samr_Password *nt_cross /* [in] [unique] */,
+					uint8_t cross2_present /* [in]  */,
+					struct samr_Password *lm_cross /* [in] [unique] */)
 {
 	struct samr_ChangePasswordUser r;
 	NTSTATUS status;
@@ -1725,8 +1725,8 @@ NTSTATUS rpccli_samr_ChangePasswordUser(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_samr_GetGroupsForUser(struct rpc_pipe_client *cli,
 				      TALLOC_CTX *mem_ctx,
-				      struct policy_handle *user_handle,
-				      struct samr_RidWithAttributeArray **rids)
+				      struct policy_handle *user_handle /* [in] [ref] */,
+				      struct samr_RidWithAttributeArray **rids /* [out] [ref] */)
 {
 	struct samr_GetGroupsForUser r;
 	NTSTATUS status;
@@ -1766,14 +1766,14 @@ NTSTATUS rpccli_samr_GetGroupsForUser(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_samr_QueryDisplayInfo(struct rpc_pipe_client *cli,
 				      TALLOC_CTX *mem_ctx,
-				      struct policy_handle *domain_handle,
-				      uint16_t level,
-				      uint32_t start_idx,
-				      uint32_t max_entries,
-				      uint32_t buf_size,
-				      uint32_t *total_size,
-				      uint32_t *returned_size,
-				      union samr_DispInfo *info)
+				      struct policy_handle *domain_handle /* [in] [ref] */,
+				      uint16_t level /* [in]  */,
+				      uint32_t start_idx /* [in]  */,
+				      uint32_t max_entries /* [in]  */,
+				      uint32_t buf_size /* [in]  */,
+				      uint32_t *total_size /* [out] [ref] */,
+				      uint32_t *returned_size /* [out] [ref] */,
+				      union samr_DispInfo *info /* [out] [ref,switch_is(level)] */)
 {
 	struct samr_QueryDisplayInfo r;
 	NTSTATUS status;
@@ -1819,10 +1819,10 @@ NTSTATUS rpccli_samr_QueryDisplayInfo(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_samr_GetDisplayEnumerationIndex(struct rpc_pipe_client *cli,
 						TALLOC_CTX *mem_ctx,
-						struct policy_handle *domain_handle,
-						uint16_t level,
-						struct lsa_String name,
-						uint32_t *idx)
+						struct policy_handle *domain_handle /* [in] [ref] */,
+						uint16_t level /* [in]  */,
+						struct lsa_String name /* [in]  */,
+						uint32_t *idx /* [out] [ref] */)
 {
 	struct samr_GetDisplayEnumerationIndex r;
 	NTSTATUS status;
@@ -1864,7 +1864,7 @@ NTSTATUS rpccli_samr_GetDisplayEnumerationIndex(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_samr_TestPrivateFunctionsDomain(struct rpc_pipe_client *cli,
 						TALLOC_CTX *mem_ctx,
-						struct policy_handle *domain_handle)
+						struct policy_handle *domain_handle /* [in] [ref] */)
 {
 	struct samr_TestPrivateFunctionsDomain r;
 	NTSTATUS status;
@@ -1903,7 +1903,7 @@ NTSTATUS rpccli_samr_TestPrivateFunctionsDomain(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_samr_TestPrivateFunctionsUser(struct rpc_pipe_client *cli,
 					      TALLOC_CTX *mem_ctx,
-					      struct policy_handle *user_handle)
+					      struct policy_handle *user_handle /* [in] [ref] */)
 {
 	struct samr_TestPrivateFunctionsUser r;
 	NTSTATUS status;
@@ -1942,8 +1942,8 @@ NTSTATUS rpccli_samr_TestPrivateFunctionsUser(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_samr_GetUserPwInfo(struct rpc_pipe_client *cli,
 				   TALLOC_CTX *mem_ctx,
-				   struct policy_handle *user_handle,
-				   struct samr_PwInfo *info)
+				   struct policy_handle *user_handle /* [in] [ref] */,
+				   struct samr_PwInfo *info /* [out] [ref] */)
 {
 	struct samr_GetUserPwInfo r;
 	NTSTATUS status;
@@ -1983,8 +1983,8 @@ NTSTATUS rpccli_samr_GetUserPwInfo(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_samr_RemoveMemberFromForeignDomain(struct rpc_pipe_client *cli,
 						   TALLOC_CTX *mem_ctx,
-						   struct policy_handle *domain_handle,
-						   struct dom_sid2 *sid)
+						   struct policy_handle *domain_handle /* [in] [ref] */,
+						   struct dom_sid2 *sid /* [in] [ref] */)
 {
 	struct samr_RemoveMemberFromForeignDomain r;
 	NTSTATUS status;
@@ -2024,9 +2024,9 @@ NTSTATUS rpccli_samr_RemoveMemberFromForeignDomain(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_samr_QueryDomainInfo2(struct rpc_pipe_client *cli,
 				      TALLOC_CTX *mem_ctx,
-				      struct policy_handle *domain_handle,
-				      uint16_t level,
-				      union samr_DomainInfo **info)
+				      struct policy_handle *domain_handle /* [in] [ref] */,
+				      uint16_t level /* [in]  */,
+				      union samr_DomainInfo **info /* [out] [ref,switch_is(level)] */)
 {
 	struct samr_QueryDomainInfo2 r;
 	NTSTATUS status;
@@ -2067,9 +2067,9 @@ NTSTATUS rpccli_samr_QueryDomainInfo2(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_samr_QueryUserInfo2(struct rpc_pipe_client *cli,
 				    TALLOC_CTX *mem_ctx,
-				    struct policy_handle *user_handle,
-				    uint16_t level,
-				    union samr_UserInfo *info)
+				    struct policy_handle *user_handle /* [in] [ref] */,
+				    uint16_t level /* [in]  */,
+				    union samr_UserInfo *info /* [out] [ref,switch_is(level)] */)
 {
 	struct samr_QueryUserInfo2 r;
 	NTSTATUS status;
@@ -2110,14 +2110,14 @@ NTSTATUS rpccli_samr_QueryUserInfo2(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_samr_QueryDisplayInfo2(struct rpc_pipe_client *cli,
 				       TALLOC_CTX *mem_ctx,
-				       struct policy_handle *domain_handle,
-				       uint16_t level,
-				       uint32_t start_idx,
-				       uint32_t max_entries,
-				       uint32_t buf_size,
-				       uint32_t *total_size,
-				       uint32_t *returned_size,
-				       union samr_DispInfo *info)
+				       struct policy_handle *domain_handle /* [in] [ref] */,
+				       uint16_t level /* [in]  */,
+				       uint32_t start_idx /* [in]  */,
+				       uint32_t max_entries /* [in]  */,
+				       uint32_t buf_size /* [in]  */,
+				       uint32_t *total_size /* [out] [ref] */,
+				       uint32_t *returned_size /* [out] [ref] */,
+				       union samr_DispInfo *info /* [out] [ref,switch_is(level)] */)
 {
 	struct samr_QueryDisplayInfo2 r;
 	NTSTATUS status;
@@ -2163,10 +2163,10 @@ NTSTATUS rpccli_samr_QueryDisplayInfo2(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_samr_GetDisplayEnumerationIndex2(struct rpc_pipe_client *cli,
 						 TALLOC_CTX *mem_ctx,
-						 struct policy_handle *domain_handle,
-						 uint16_t level,
-						 struct lsa_String name,
-						 uint32_t *idx)
+						 struct policy_handle *domain_handle /* [in] [ref] */,
+						 uint16_t level /* [in]  */,
+						 struct lsa_String name /* [in]  */,
+						 uint32_t *idx /* [out] [ref] */)
 {
 	struct samr_GetDisplayEnumerationIndex2 r;
 	NTSTATUS status;
@@ -2208,13 +2208,13 @@ NTSTATUS rpccli_samr_GetDisplayEnumerationIndex2(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_samr_CreateUser2(struct rpc_pipe_client *cli,
 				 TALLOC_CTX *mem_ctx,
-				 struct policy_handle *domain_handle,
-				 struct lsa_String *account_name,
-				 uint32_t acct_flags,
-				 uint32_t access_mask,
-				 struct policy_handle *user_handle,
-				 uint32_t *access_granted,
-				 uint32_t *rid)
+				 struct policy_handle *domain_handle /* [in] [ref] */,
+				 struct lsa_String *account_name /* [in] [ref] */,
+				 uint32_t acct_flags /* [in]  */,
+				 uint32_t access_mask /* [in]  */,
+				 struct policy_handle *user_handle /* [out] [ref] */,
+				 uint32_t *access_granted /* [out] [ref] */,
+				 uint32_t *rid /* [out] [ref] */)
 {
 	struct samr_CreateUser2 r;
 	NTSTATUS status;
@@ -2259,14 +2259,14 @@ NTSTATUS rpccli_samr_CreateUser2(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_samr_QueryDisplayInfo3(struct rpc_pipe_client *cli,
 				       TALLOC_CTX *mem_ctx,
-				       struct policy_handle *domain_handle,
-				       uint16_t level,
-				       uint32_t start_idx,
-				       uint32_t max_entries,
-				       uint32_t buf_size,
-				       uint32_t *total_size,
-				       uint32_t *returned_size,
-				       union samr_DispInfo *info)
+				       struct policy_handle *domain_handle /* [in] [ref] */,
+				       uint16_t level /* [in]  */,
+				       uint32_t start_idx /* [in]  */,
+				       uint32_t max_entries /* [in]  */,
+				       uint32_t buf_size /* [in]  */,
+				       uint32_t *total_size /* [out] [ref] */,
+				       uint32_t *returned_size /* [out] [ref] */,
+				       union samr_DispInfo *info /* [out] [ref,switch_is(level)] */)
 {
 	struct samr_QueryDisplayInfo3 r;
 	NTSTATUS status;
@@ -2312,8 +2312,8 @@ NTSTATUS rpccli_samr_QueryDisplayInfo3(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_samr_AddMultipleMembersToAlias(struct rpc_pipe_client *cli,
 					       TALLOC_CTX *mem_ctx,
-					       struct policy_handle *alias_handle,
-					       struct lsa_SidArray *sids)
+					       struct policy_handle *alias_handle /* [in] [ref] */,
+					       struct lsa_SidArray *sids /* [in] [ref] */)
 {
 	struct samr_AddMultipleMembersToAlias r;
 	NTSTATUS status;
@@ -2353,8 +2353,8 @@ NTSTATUS rpccli_samr_AddMultipleMembersToAlias(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_samr_RemoveMultipleMembersFromAlias(struct rpc_pipe_client *cli,
 						    TALLOC_CTX *mem_ctx,
-						    struct policy_handle *alias_handle,
-						    struct lsa_SidArray *sids)
+						    struct policy_handle *alias_handle /* [in] [ref] */,
+						    struct lsa_SidArray *sids /* [in] [ref] */)
 {
 	struct samr_RemoveMultipleMembersFromAlias r;
 	NTSTATUS status;
@@ -2394,10 +2394,10 @@ NTSTATUS rpccli_samr_RemoveMultipleMembersFromAlias(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_samr_OemChangePasswordUser2(struct rpc_pipe_client *cli,
 					    TALLOC_CTX *mem_ctx,
-					    struct lsa_AsciiString *server,
-					    struct lsa_AsciiString *account,
-					    struct samr_CryptPassword *password,
-					    struct samr_Password *hash)
+					    struct lsa_AsciiString *server /* [in] [unique] */,
+					    struct lsa_AsciiString *account /* [in] [ref] */,
+					    struct samr_CryptPassword *password /* [in] [unique] */,
+					    struct samr_Password *hash /* [in] [unique] */)
 {
 	struct samr_OemChangePasswordUser2 r;
 	NTSTATUS status;
@@ -2439,13 +2439,13 @@ NTSTATUS rpccli_samr_OemChangePasswordUser2(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_samr_ChangePasswordUser2(struct rpc_pipe_client *cli,
 					 TALLOC_CTX *mem_ctx,
-					 struct lsa_String *server,
-					 struct lsa_String *account,
-					 struct samr_CryptPassword *nt_password,
-					 struct samr_Password *nt_verifier,
-					 uint8_t lm_change,
-					 struct samr_CryptPassword *lm_password,
-					 struct samr_Password *lm_verifier)
+					 struct lsa_String *server /* [in] [unique] */,
+					 struct lsa_String *account /* [in] [ref] */,
+					 struct samr_CryptPassword *nt_password /* [in] [unique] */,
+					 struct samr_Password *nt_verifier /* [in] [unique] */,
+					 uint8_t lm_change /* [in]  */,
+					 struct samr_CryptPassword *lm_password /* [in] [unique] */,
+					 struct samr_Password *lm_verifier /* [in] [unique] */)
 {
 	struct samr_ChangePasswordUser2 r;
 	NTSTATUS status;
@@ -2490,8 +2490,8 @@ NTSTATUS rpccli_samr_ChangePasswordUser2(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_samr_GetDomPwInfo(struct rpc_pipe_client *cli,
 				  TALLOC_CTX *mem_ctx,
-				  struct lsa_String *domain_name,
-				  struct samr_PwInfo *info)
+				  struct lsa_String *domain_name /* [in] [unique] */,
+				  struct samr_PwInfo *info /* [out] [ref] */)
 {
 	struct samr_GetDomPwInfo r;
 	NTSTATUS status;
@@ -2531,9 +2531,9 @@ NTSTATUS rpccli_samr_GetDomPwInfo(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_samr_Connect2(struct rpc_pipe_client *cli,
 			      TALLOC_CTX *mem_ctx,
-			      const char *system_name,
-			      uint32_t access_mask,
-			      struct policy_handle *connect_handle)
+			      const char *system_name /* [in] [unique,charset(UTF16)] */,
+			      uint32_t access_mask /* [in]  */,
+			      struct policy_handle *connect_handle /* [out] [ref] */)
 {
 	struct samr_Connect2 r;
 	NTSTATUS status;
@@ -2574,9 +2574,9 @@ NTSTATUS rpccli_samr_Connect2(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_samr_SetUserInfo2(struct rpc_pipe_client *cli,
 				  TALLOC_CTX *mem_ctx,
-				  struct policy_handle *user_handle,
-				  uint16_t level,
-				  union samr_UserInfo *info)
+				  struct policy_handle *user_handle /* [in] [ref] */,
+				  uint16_t level /* [in]  */,
+				  union samr_UserInfo *info /* [in] [ref,switch_is(level)] */)
 {
 	struct samr_SetUserInfo2 r;
 	NTSTATUS status;
@@ -2617,10 +2617,10 @@ NTSTATUS rpccli_samr_SetUserInfo2(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_samr_SetBootKeyInformation(struct rpc_pipe_client *cli,
 					   TALLOC_CTX *mem_ctx,
-					   struct policy_handle *connect_handle,
-					   uint32_t unknown1,
-					   uint32_t unknown2,
-					   uint32_t unknown3)
+					   struct policy_handle *connect_handle /* [in] [ref] */,
+					   uint32_t unknown1 /* [in]  */,
+					   uint32_t unknown2 /* [in]  */,
+					   uint32_t unknown3 /* [in]  */)
 {
 	struct samr_SetBootKeyInformation r;
 	NTSTATUS status;
@@ -2662,8 +2662,8 @@ NTSTATUS rpccli_samr_SetBootKeyInformation(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_samr_GetBootKeyInformation(struct rpc_pipe_client *cli,
 					   TALLOC_CTX *mem_ctx,
-					   struct policy_handle *domain_handle,
-					   uint32_t *unknown)
+					   struct policy_handle *domain_handle /* [in] [ref] */,
+					   uint32_t *unknown /* [out] [ref] */)
 {
 	struct samr_GetBootKeyInformation r;
 	NTSTATUS status;
@@ -2703,10 +2703,10 @@ NTSTATUS rpccli_samr_GetBootKeyInformation(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_samr_Connect3(struct rpc_pipe_client *cli,
 			      TALLOC_CTX *mem_ctx,
-			      const char *system_name,
-			      uint32_t unknown,
-			      uint32_t access_mask,
-			      struct policy_handle *connect_handle)
+			      const char *system_name /* [in] [unique,charset(UTF16)] */,
+			      uint32_t unknown /* [in]  */,
+			      uint32_t access_mask /* [in]  */,
+			      struct policy_handle *connect_handle /* [out] [ref] */)
 {
 	struct samr_Connect3 r;
 	NTSTATUS status;
@@ -2748,10 +2748,10 @@ NTSTATUS rpccli_samr_Connect3(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_samr_Connect4(struct rpc_pipe_client *cli,
 			      TALLOC_CTX *mem_ctx,
-			      const char *system_name,
-			      enum samr_ConnectVersion client_version,
-			      uint32_t access_mask,
-			      struct policy_handle *connect_handle)
+			      const char *system_name /* [in] [unique,charset(UTF16)] */,
+			      enum samr_ConnectVersion client_version /* [in]  */,
+			      uint32_t access_mask /* [in]  */,
+			      struct policy_handle *connect_handle /* [out] [ref] */)
 {
 	struct samr_Connect4 r;
 	NTSTATUS status;
@@ -2793,16 +2793,16 @@ NTSTATUS rpccli_samr_Connect4(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_samr_ChangePasswordUser3(struct rpc_pipe_client *cli,
 					 TALLOC_CTX *mem_ctx,
-					 struct lsa_String *server,
-					 struct lsa_String *account,
-					 struct samr_CryptPassword *nt_password,
-					 struct samr_Password *nt_verifier,
-					 uint8_t lm_change,
-					 struct samr_CryptPassword *lm_password,
-					 struct samr_Password *lm_verifier,
-					 struct samr_CryptPassword *password3,
-					 struct samr_DomInfo1 **dominfo,
-					 struct samr_ChangeReject **reject)
+					 struct lsa_String *server /* [in] [unique] */,
+					 struct lsa_String *account /* [in] [ref] */,
+					 struct samr_CryptPassword *nt_password /* [in] [unique] */,
+					 struct samr_Password *nt_verifier /* [in] [unique] */,
+					 uint8_t lm_change /* [in]  */,
+					 struct samr_CryptPassword *lm_password /* [in] [unique] */,
+					 struct samr_Password *lm_verifier /* [in] [unique] */,
+					 struct samr_CryptPassword *password3 /* [in] [unique] */,
+					 struct samr_DomInfo1 **dominfo /* [out] [ref] */,
+					 struct samr_ChangeReject **reject /* [out] [ref] */)
 {
 	struct samr_ChangePasswordUser3 r;
 	NTSTATUS status;
@@ -2850,13 +2850,13 @@ NTSTATUS rpccli_samr_ChangePasswordUser3(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_samr_Connect5(struct rpc_pipe_client *cli,
 			      TALLOC_CTX *mem_ctx,
-			      const char *system_name,
-			      uint32_t access_mask,
-			      uint32_t level_in,
-			      union samr_ConnectInfo *info_in,
-			      uint32_t *level_out,
-			      union samr_ConnectInfo *info_out,
-			      struct policy_handle *connect_handle)
+			      const char *system_name /* [in] [unique,charset(UTF16)] */,
+			      uint32_t access_mask /* [in]  */,
+			      uint32_t level_in /* [in]  */,
+			      union samr_ConnectInfo *info_in /* [in] [ref,switch_is(level_in)] */,
+			      uint32_t *level_out /* [out] [ref] */,
+			      union samr_ConnectInfo *info_out /* [out] [ref,switch_is(*level_out)] */,
+			      struct policy_handle *connect_handle /* [out] [ref] */)
 {
 	struct samr_Connect5 r;
 	NTSTATUS status;
@@ -2901,9 +2901,9 @@ NTSTATUS rpccli_samr_Connect5(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_samr_RidToSid(struct rpc_pipe_client *cli,
 			      TALLOC_CTX *mem_ctx,
-			      struct policy_handle *domain_handle,
-			      uint32_t rid,
-			      struct dom_sid2 *sid)
+			      struct policy_handle *domain_handle /* [in] [ref] */,
+			      uint32_t rid /* [in]  */,
+			      struct dom_sid2 *sid /* [out] [ref] */)
 {
 	struct samr_RidToSid r;
 	NTSTATUS status;
@@ -2944,9 +2944,9 @@ NTSTATUS rpccli_samr_RidToSid(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_samr_SetDsrmPassword(struct rpc_pipe_client *cli,
 				     TALLOC_CTX *mem_ctx,
-				     struct lsa_String *name,
-				     uint32_t unknown,
-				     struct samr_Password *hash)
+				     struct lsa_String *name /* [in] [unique] */,
+				     uint32_t unknown /* [in]  */,
+				     struct samr_Password *hash /* [in] [unique] */)
 {
 	struct samr_SetDsrmPassword r;
 	NTSTATUS status;
@@ -2987,9 +2987,9 @@ NTSTATUS rpccli_samr_SetDsrmPassword(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_samr_ValidatePassword(struct rpc_pipe_client *cli,
 				      TALLOC_CTX *mem_ctx,
-				      enum samr_ValidatePasswordLevel level,
-				      union samr_ValidatePasswordReq req,
-				      union samr_ValidatePasswordRep *rep)
+				      enum samr_ValidatePasswordLevel level /* [in]  */,
+				      union samr_ValidatePasswordReq req /* [in] [switch_is(level)] */,
+				      union samr_ValidatePasswordRep *rep /* [out] [ref,switch_is(level)] */)
 {
 	struct samr_ValidatePassword r;
 	NTSTATUS status;
diff --git a/source3/librpc/gen_ndr/cli_samr.h b/source3/librpc/gen_ndr/cli_samr.h
index 92fcf73536..53cdbfac3a 100644
--- a/source3/librpc/gen_ndr/cli_samr.h
+++ b/source3/librpc/gen_ndr/cli_samr.h
@@ -3,387 +3,387 @@
 #define __CLI_SAMR__
 NTSTATUS rpccli_samr_Connect(struct rpc_pipe_client *cli,
 			     TALLOC_CTX *mem_ctx,
-			     uint16_t *system_name,
-			     uint32_t access_mask,
-			     struct policy_handle *connect_handle);
+			     uint16_t *system_name /* [in] [unique] */,
+			     uint32_t access_mask /* [in]  */,
+			     struct policy_handle *connect_handle /* [out] [ref] */);
 NTSTATUS rpccli_samr_Close(struct rpc_pipe_client *cli,
 			   TALLOC_CTX *mem_ctx,
-			   struct policy_handle *handle);
+			   struct policy_handle *handle /* [in,out] [ref] */);
 NTSTATUS rpccli_samr_SetSecurity(struct rpc_pipe_client *cli,
 				 TALLOC_CTX *mem_ctx,
-				 struct policy_handle *handle,
-				 uint32_t sec_info,
-				 struct sec_desc_buf *sdbuf);
+				 struct policy_handle *handle /* [in] [ref] */,
+				 uint32_t sec_info /* [in]  */,
+				 struct sec_desc_buf *sdbuf /* [in] [ref] */);
 NTSTATUS rpccli_samr_QuerySecurity(struct rpc_pipe_client *cli,
 				   TALLOC_CTX *mem_ctx,
-				   struct policy_handle *handle,
-				   uint32_t sec_info,
-				   struct sec_desc_buf **sdbuf);
+				   struct policy_handle *handle /* [in] [ref] */,
+				   uint32_t sec_info /* [in]  */,
+				   struct sec_desc_buf **sdbuf /* [out] [ref] */);
 NTSTATUS rpccli_samr_Shutdown(struct rpc_pipe_client *cli,
 			      TALLOC_CTX *mem_ctx,
-			      struct policy_handle *connect_handle);
+			      struct policy_handle *connect_handle /* [in] [ref] */);
 NTSTATUS rpccli_samr_LookupDomain(struct rpc_pipe_client *cli,
 				  TALLOC_CTX *mem_ctx,
-				  struct policy_handle *connect_handle,
-				  struct lsa_String *domain_name,
-				  struct dom_sid2 **sid);
+				  struct policy_handle *connect_handle /* [in] [ref] */,
+				  struct lsa_String *domain_name /* [in] [ref] */,
+				  struct dom_sid2 **sid /* [out] [ref] */);
 NTSTATUS rpccli_samr_EnumDomains(struct rpc_pipe_client *cli,
 				 TALLOC_CTX *mem_ctx,
-				 struct policy_handle *connect_handle,
-				 uint32_t *resume_handle,
-				 struct samr_SamArray **sam,
-				 uint32_t buf_size,
-				 uint32_t *num_entries);
+				 struct policy_handle *connect_handle /* [in] [ref] */,
+				 uint32_t *resume_handle /* [in,out] [ref] */,
+				 struct samr_SamArray **sam /* [out] [ref] */,
+				 uint32_t buf_size /* [in]  */,
+				 uint32_t *num_entries /* [out] [ref] */);
 NTSTATUS rpccli_samr_OpenDomain(struct rpc_pipe_client *cli,
 				TALLOC_CTX *mem_ctx,
-				struct policy_handle *connect_handle,
-				uint32_t access_mask,
-				struct dom_sid2 *sid,
-				struct policy_handle *domain_handle);
+				struct policy_handle *connect_handle /* [in] [ref] */,
+				uint32_t access_mask /* [in]  */,
+				struct dom_sid2 *sid /* [in] [ref] */,
+				struct policy_handle *domain_handle /* [out] [ref] */);
 NTSTATUS rpccli_samr_QueryDomainInfo(struct rpc_pipe_client *cli,
 				     TALLOC_CTX *mem_ctx,
-				     struct policy_handle *domain_handle,
-				     uint16_t level,
-				     union samr_DomainInfo **info);
+				     struct policy_handle *domain_handle /* [in] [ref] */,
+				     uint16_t level /* [in]  */,
+				     union samr_DomainInfo **info /* [out] [ref,switch_is(level)] */);
 NTSTATUS rpccli_samr_SetDomainInfo(struct rpc_pipe_client *cli,
 				   TALLOC_CTX *mem_ctx,
-				   struct policy_handle *domain_handle,
-				   uint16_t level,
-				   union samr_DomainInfo *info);
+				   struct policy_handle *domain_handle /* [in] [ref] */,
+				   uint16_t level /* [in]  */,
+				   union samr_DomainInfo *info /* [in] [ref,switch_is(level)] */);
 NTSTATUS rpccli_samr_CreateDomainGroup(struct rpc_pipe_client *cli,
 				       TALLOC_CTX *mem_ctx,
-				       struct policy_handle *domain_handle,
-				       struct lsa_String *name,
-				       uint32_t access_mask,
-				       struct policy_handle *group_handle,
-				       uint32_t *rid);
+				       struct policy_handle *domain_handle /* [in] [ref] */,
+				       struct lsa_String *name /* [in] [ref] */,
+				       uint32_t access_mask /* [in]  */,
+				       struct policy_handle *group_handle /* [out] [ref] */,
+				       uint32_t *rid /* [out] [ref] */);
 NTSTATUS rpccli_samr_EnumDomainGroups(struct rpc_pipe_client *cli,
 				      TALLOC_CTX *mem_ctx,
-				      struct policy_handle *domain_handle,
-				      uint32_t *resume_handle,
-				      struct samr_SamArray **sam,
-				      uint32_t max_size,
-				      uint32_t *num_entries);
+				      struct policy_handle *domain_handle /* [in] [ref] */,
+				      uint32_t *resume_handle /* [in,out] [ref] */,
+				      struct samr_SamArray **sam /* [out] [ref] */,
+				      uint32_t max_size /* [in]  */,
+				      uint32_t *num_entries /* [out] [ref] */);
 NTSTATUS rpccli_samr_CreateUser(struct rpc_pipe_client *cli,
 				TALLOC_CTX *mem_ctx,
-				struct policy_handle *domain_handle,
-				struct lsa_String *account_name,
-				uint32_t access_mask,
-				struct policy_handle *user_handle,
-				uint32_t *rid);
+				struct policy_handle *domain_handle /* [in] [ref] */,
+				struct lsa_String *account_name /* [in] [ref] */,
+				uint32_t access_mask /* [in]  */,
+				struct policy_handle *user_handle /* [out] [ref] */,
+				uint32_t *rid /* [out] [ref] */);
 NTSTATUS rpccli_samr_EnumDomainUsers(struct rpc_pipe_client *cli,
 				     TALLOC_CTX *mem_ctx,
-				     struct policy_handle *domain_handle,
-				     uint32_t *resume_handle,
-				     uint32_t acct_flags,
-				     struct samr_SamArray **sam,
-				     uint32_t max_size,
-				     uint32_t *num_entries);
+				     struct policy_handle *domain_handle /* [in] [ref] */,
+				     uint32_t *resume_handle /* [in,out] [ref] */,
+				     uint32_t acct_flags /* [in]  */,
+				     struct samr_SamArray **sam /* [out] [ref] */,
+				     uint32_t max_size /* [in]  */,
+				     uint32_t *num_entries /* [out] [ref] */);
 NTSTATUS rpccli_samr_CreateDomAlias(struct rpc_pipe_client *cli,
 				    TALLOC_CTX *mem_ctx,
-				    struct policy_handle *domain_handle,
-				    struct lsa_String *alias_name,
-				    uint32_t access_mask,
-				    struct policy_handle *alias_handle,
-				    uint32_t *rid);
+				    struct policy_handle *domain_handle /* [in] [ref] */,
+				    struct lsa_String *alias_name /* [in] [ref] */,
+				    uint32_t access_mask /* [in]  */,
+				    struct policy_handle *alias_handle /* [out] [ref] */,
+				    uint32_t *rid /* [out] [ref] */);
 NTSTATUS rpccli_samr_EnumDomainAliases(struct rpc_pipe_client *cli,
 				       TALLOC_CTX *mem_ctx,
-				       struct policy_handle *domain_handle,
-				       uint32_t *resume_handle,
-				       struct samr_SamArray **sam,
-				       uint32_t max_size,
-				       uint32_t *num_entries);
+				       struct policy_handle *domain_handle /* [in] [ref] */,
+				       uint32_t *resume_handle /* [in,out] [ref] */,
+				       struct samr_SamArray **sam /* [out] [ref] */,
+				       uint32_t max_size /* [in]  */,
+				       uint32_t *num_entries /* [out] [ref] */);
 NTSTATUS rpccli_samr_GetAliasMembership(struct rpc_pipe_client *cli,
 					TALLOC_CTX *mem_ctx,
-					struct policy_handle *domain_handle,
-					struct lsa_SidArray *sids,
-					struct samr_Ids *rids);
+					struct policy_handle *domain_handle /* [in] [ref] */,
+					struct lsa_SidArray *sids /* [in] [ref] */,
+					struct samr_Ids *rids /* [out] [ref] */);
 NTSTATUS rpccli_samr_LookupNames(struct rpc_pipe_client *cli,
 				 TALLOC_CTX *mem_ctx,
-				 struct policy_handle *domain_handle,
-				 uint32_t num_names,
-				 struct lsa_String *names,
-				 struct samr_Ids *rids,
-				 struct samr_Ids *types);
+				 struct policy_handle *domain_handle /* [in] [ref] */,
+				 uint32_t num_names /* [in] [range(0,1000)] */,
+				 struct lsa_String *names /* [in] [length_is(num_names),size_is(1000)] */,
+				 struct samr_Ids *rids /* [out] [ref] */,
+				 struct samr_Ids *types /* [out] [ref] */);
 NTSTATUS rpccli_samr_LookupRids(struct rpc_pipe_client *cli,
 				TALLOC_CTX *mem_ctx,
-				struct policy_handle *domain_handle,
-				uint32_t num_rids,
-				uint32_t *rids,
-				struct lsa_Strings *names,
-				struct samr_Ids *types);
+				struct policy_handle *domain_handle /* [in] [ref] */,
+				uint32_t num_rids /* [in] [range(0,1000)] */,
+				uint32_t *rids /* [in] [length_is(num_rids),size_is(1000)] */,
+				struct lsa_Strings *names /* [out] [ref] */,
+				struct samr_Ids *types /* [out] [ref] */);
 NTSTATUS rpccli_samr_OpenGroup(struct rpc_pipe_client *cli,
 			       TALLOC_CTX *mem_ctx,
-			       struct policy_handle *domain_handle,
-			       uint32_t access_mask,
-			       uint32_t rid,
-			       struct policy_handle *group_handle);
+			       struct policy_handle *domain_handle /* [in] [ref] */,
+			       uint32_t access_mask /* [in]  */,
+			       uint32_t rid /* [in]  */,
+			       struct policy_handle *group_handle /* [out] [ref] */);
 NTSTATUS rpccli_samr_QueryGroupInfo(struct rpc_pipe_client *cli,
 				    TALLOC_CTX *mem_ctx,
-				    struct policy_handle *group_handle,
-				    enum samr_GroupInfoEnum level,
-				    union samr_GroupInfo **info);
+				    struct policy_handle *group_handle /* [in] [ref] */,
+				    enum samr_GroupInfoEnum level /* [in]  */,
+				    union samr_GroupInfo **info /* [out] [ref,switch_is(level)] */);
 NTSTATUS rpccli_samr_SetGroupInfo(struct rpc_pipe_client *cli,
 				  TALLOC_CTX *mem_ctx,
-				  struct policy_handle *group_handle,
-				  enum samr_GroupInfoEnum level,
-				  union samr_GroupInfo *info);
+				  struct policy_handle *group_handle /* [in] [ref] */,
+				  enum samr_GroupInfoEnum level /* [in]  */,
+				  union samr_GroupInfo *info /* [in] [ref,switch_is(level)] */);
 NTSTATUS rpccli_samr_AddGroupMember(struct rpc_pipe_client *cli,
 				    TALLOC_CTX *mem_ctx,
-				    struct policy_handle *group_handle,
-				    uint32_t rid,
-				    uint32_t flags);
+				    struct policy_handle *group_handle /* [in] [ref] */,
+				    uint32_t rid /* [in]  */,
+				    uint32_t flags /* [in]  */);
 NTSTATUS rpccli_samr_DeleteDomainGroup(struct rpc_pipe_client *cli,
 				       TALLOC_CTX *mem_ctx,
-				       struct policy_handle *group_handle);
+				       struct policy_handle *group_handle /* [in,out] [ref] */);
 NTSTATUS rpccli_samr_DeleteGroupMember(struct rpc_pipe_client *cli,
 				       TALLOC_CTX *mem_ctx,
-				       struct policy_handle *group_handle,
-				       uint32_t rid);
+				       struct policy_handle *group_handle /* [in] [ref] */,
+				       uint32_t rid /* [in]  */);
 NTSTATUS rpccli_samr_QueryGroupMember(struct rpc_pipe_client *cli,
 				      TALLOC_CTX *mem_ctx,
-				      struct policy_handle *group_handle,
-				      struct samr_RidTypeArray **rids);
+				      struct policy_handle *group_handle /* [in] [ref] */,
+				      struct samr_RidTypeArray **rids /* [out] [ref] */);
 NTSTATUS rpccli_samr_SetMemberAttributesOfGroup(struct rpc_pipe_client *cli,
 						TALLOC_CTX *mem_ctx,
-						struct policy_handle *group_handle,
-						uint32_t unknown1,
-						uint32_t unknown2);
+						struct policy_handle *group_handle /* [in] [ref] */,
+						uint32_t unknown1 /* [in]  */,
+						uint32_t unknown2 /* [in]  */);
 NTSTATUS rpccli_samr_OpenAlias(struct rpc_pipe_client *cli,
 			       TALLOC_CTX *mem_ctx,
-			       struct policy_handle *domain_handle,
-			       uint32_t access_mask,
-			       uint32_t rid,
-			       struct policy_handle *alias_handle);
+			       struct policy_handle *domain_handle /* [in] [ref] */,
+			       uint32_t access_mask /* [in]  */,
+			       uint32_t rid /* [in]  */,
+			       struct policy_handle *alias_handle /* [out] [ref] */);
 NTSTATUS rpccli_samr_QueryAliasInfo(struct rpc_pipe_client *cli,
 				    TALLOC_CTX *mem_ctx,
-				    struct policy_handle *alias_handle,
-				    enum samr_AliasInfoEnum level,
-				    union samr_AliasInfo **info);
+				    struct policy_handle *alias_handle /* [in] [ref] */,
+				    enum samr_AliasInfoEnum level /* [in]  */,
+				    union samr_AliasInfo **info /* [out] [ref,switch_is(level)] */);
 NTSTATUS rpccli_samr_SetAliasInfo(struct rpc_pipe_client *cli,
 				  TALLOC_CTX *mem_ctx,
-				  struct policy_handle *alias_handle,
-				  enum samr_AliasInfoEnum level,
-				  union samr_AliasInfo *info);
+				  struct policy_handle *alias_handle /* [in] [ref] */,
+				  enum samr_AliasInfoEnum level /* [in]  */,
+				  union samr_AliasInfo *info /* [in] [ref,switch_is(level)] */);
 NTSTATUS rpccli_samr_DeleteDomAlias(struct rpc_pipe_client *cli,
 				    TALLOC_CTX *mem_ctx,
-				    struct policy_handle *alias_handle);
+				    struct policy_handle *alias_handle /* [in,out] [ref] */);
 NTSTATUS rpccli_samr_AddAliasMember(struct rpc_pipe_client *cli,
 				    TALLOC_CTX *mem_ctx,
-				    struct policy_handle *alias_handle,
-				    struct dom_sid2 *sid);
+				    struct policy_handle *alias_handle /* [in] [ref] */,
+				    struct dom_sid2 *sid /* [in] [ref] */);
 NTSTATUS rpccli_samr_DeleteAliasMember(struct rpc_pipe_client *cli,
 				       TALLOC_CTX *mem_ctx,
-				       struct policy_handle *alias_handle,
-				       struct dom_sid2 *sid);
+				       struct policy_handle *alias_handle /* [in] [ref] */,
+				       struct dom_sid2 *sid /* [in] [ref] */);
 NTSTATUS rpccli_samr_GetMembersInAlias(struct rpc_pipe_client *cli,
 				       TALLOC_CTX *mem_ctx,
-				       struct policy_handle *alias_handle,
-				       struct lsa_SidArray *sids);
+				       struct policy_handle *alias_handle /* [in] [ref] */,
+				       struct lsa_SidArray *sids /* [out] [ref] */);
 NTSTATUS rpccli_samr_OpenUser(struct rpc_pipe_client *cli,
 			      TALLOC_CTX *mem_ctx,
-			      struct policy_handle *domain_handle,
-			      uint32_t access_mask,
-			      uint32_t rid,
-			      struct policy_handle *user_handle);
+			      struct policy_handle *domain_handle /* [in] [ref] */,
+			      uint32_t access_mask /* [in]  */,
+			      uint32_t rid /* [in]  */,
+			      struct policy_handle *user_handle /* [out] [ref] */);
 NTSTATUS rpccli_samr_DeleteUser(struct rpc_pipe_client *cli,
 				TALLOC_CTX *mem_ctx,
-				struct policy_handle *user_handle);
+				struct policy_handle *user_handle /* [in,out] [ref] */);
 NTSTATUS rpccli_samr_QueryUserInfo(struct rpc_pipe_client *cli,
 				   TALLOC_CTX *mem_ctx,
-				   struct policy_handle *user_handle,
-				   uint16_t level,
-				   union samr_UserInfo **info);
+				   struct policy_handle *user_handle /* [in] [ref] */,
+				   uint16_t level /* [in]  */,
+				   union samr_UserInfo **info /* [out] [ref,switch_is(level)] */);
 NTSTATUS rpccli_samr_SetUserInfo(struct rpc_pipe_client *cli,
 				 TALLOC_CTX *mem_ctx,
-				 struct policy_handle *user_handle,
-				 uint16_t level,
-				 union samr_UserInfo *info);
+				 struct policy_handle *user_handle /* [in] [ref] */,
+				 uint16_t level /* [in]  */,
+				 union samr_UserInfo *info /* [in] [ref,switch_is(level)] */);
 NTSTATUS rpccli_samr_ChangePasswordUser(struct rpc_pipe_client *cli,
 					TALLOC_CTX *mem_ctx,
-					struct policy_handle *user_handle,
-					uint8_t lm_present,
-					struct samr_Password *old_lm_crypted,
-					struct samr_Password *new_lm_crypted,
-					uint8_t nt_present,
-					struct samr_Password *old_nt_crypted,
-					struct samr_Password *new_nt_crypted,
-					uint8_t cross1_present,
-					struct samr_Password *nt_cross,
-					uint8_t cross2_present,
-					struct samr_Password *lm_cross);
+					struct policy_handle *user_handle /* [in] [ref] */,
+					uint8_t lm_present /* [in]  */,
+					struct samr_Password *old_lm_crypted /* [in] [unique] */,
+					struct samr_Password *new_lm_crypted /* [in] [unique] */,
+					uint8_t nt_present /* [in]  */,
+					struct samr_Password *old_nt_crypted /* [in] [unique] */,
+					struct samr_Password *new_nt_crypted /* [in] [unique] */,
+					uint8_t cross1_present /* [in]  */,
+					struct samr_Password *nt_cross /* [in] [unique] */,
+					uint8_t cross2_present /* [in]  */,
+					struct samr_Password *lm_cross /* [in] [unique] */);
 NTSTATUS rpccli_samr_GetGroupsForUser(struct rpc_pipe_client *cli,
 				      TALLOC_CTX *mem_ctx,
-				      struct policy_handle *user_handle,
-				      struct samr_RidWithAttributeArray **rids);
+				      struct policy_handle *user_handle /* [in] [ref] */,
+				      struct samr_RidWithAttributeArray **rids /* [out] [ref] */);
 NTSTATUS rpccli_samr_QueryDisplayInfo(struct rpc_pipe_client *cli,
 				      TALLOC_CTX *mem_ctx,
-				      struct policy_handle *domain_handle,
-				      uint16_t level,
-				      uint32_t start_idx,
-				      uint32_t max_entries,
-				      uint32_t buf_size,
-				      uint32_t *total_size,
-				      uint32_t *returned_size,
-				      union samr_DispInfo *info);
+				      struct policy_handle *domain_handle /* [in] [ref] */,
+				      uint16_t level /* [in]  */,
+				      uint32_t start_idx /* [in]  */,
+				      uint32_t max_entries /* [in]  */,
+				      uint32_t buf_size /* [in]  */,
+				      uint32_t *total_size /* [out] [ref] */,
+				      uint32_t *returned_size /* [out] [ref] */,
+				      union samr_DispInfo *info /* [out] [ref,switch_is(level)] */);
 NTSTATUS rpccli_samr_GetDisplayEnumerationIndex(struct rpc_pipe_client *cli,
 						TALLOC_CTX *mem_ctx,
-						struct policy_handle *domain_handle,
-						uint16_t level,
-						struct lsa_String name,
-						uint32_t *idx);
+						struct policy_handle *domain_handle /* [in] [ref] */,
+						uint16_t level /* [in]  */,
+						struct lsa_String name /* [in]  */,
+						uint32_t *idx /* [out] [ref] */);
 NTSTATUS rpccli_samr_TestPrivateFunctionsDomain(struct rpc_pipe_client *cli,
 						TALLOC_CTX *mem_ctx,
-						struct policy_handle *domain_handle);
+						struct policy_handle *domain_handle /* [in] [ref] */);
 NTSTATUS rpccli_samr_TestPrivateFunctionsUser(struct rpc_pipe_client *cli,
 					      TALLOC_CTX *mem_ctx,
-					      struct policy_handle *user_handle);
+					      struct policy_handle *user_handle /* [in] [ref] */);
 NTSTATUS rpccli_samr_GetUserPwInfo(struct rpc_pipe_client *cli,
 				   TALLOC_CTX *mem_ctx,
-				   struct policy_handle *user_handle,
-				   struct samr_PwInfo *info);
+				   struct policy_handle *user_handle /* [in] [ref] */,
+				   struct samr_PwInfo *info /* [out] [ref] */);
 NTSTATUS rpccli_samr_RemoveMemberFromForeignDomain(struct rpc_pipe_client *cli,
 						   TALLOC_CTX *mem_ctx,
-						   struct policy_handle *domain_handle,
-						   struct dom_sid2 *sid);
+						   struct policy_handle *domain_handle /* [in] [ref] */,
+						   struct dom_sid2 *sid /* [in] [ref] */);
 NTSTATUS rpccli_samr_QueryDomainInfo2(struct rpc_pipe_client *cli,
 				      TALLOC_CTX *mem_ctx,
-				      struct policy_handle *domain_handle,
-				      uint16_t level,
-				      union samr_DomainInfo **info);
+				      struct policy_handle *domain_handle /* [in] [ref] */,
+				      uint16_t level /* [in]  */,
+				      union samr_DomainInfo **info /* [out] [ref,switch_is(level)] */);
 NTSTATUS rpccli_samr_QueryUserInfo2(struct rpc_pipe_client *cli,
 				    TALLOC_CTX *mem_ctx,
-				    struct policy_handle *user_handle,
-				    uint16_t level,
-				    union samr_UserInfo *info);
+				    struct policy_handle *user_handle /* [in] [ref] */,
+				    uint16_t level /* [in]  */,
+				    union samr_UserInfo *info /* [out] [ref,switch_is(level)] */);
 NTSTATUS rpccli_samr_QueryDisplayInfo2(struct rpc_pipe_client *cli,
 				       TALLOC_CTX *mem_ctx,
-				       struct policy_handle *domain_handle,
-				       uint16_t level,
-				       uint32_t start_idx,
-				       uint32_t max_entries,
-				       uint32_t buf_size,
-				       uint32_t *total_size,
-				       uint32_t *returned_size,
-				       union samr_DispInfo *info);
+				       struct policy_handle *domain_handle /* [in] [ref] */,
+				       uint16_t level /* [in]  */,
+				       uint32_t start_idx /* [in]  */,
+				       uint32_t max_entries /* [in]  */,
+				       uint32_t buf_size /* [in]  */,
+				       uint32_t *total_size /* [out] [ref] */,
+				       uint32_t *returned_size /* [out] [ref] */,
+				       union samr_DispInfo *info /* [out] [ref,switch_is(level)] */);
 NTSTATUS rpccli_samr_GetDisplayEnumerationIndex2(struct rpc_pipe_client *cli,
 						 TALLOC_CTX *mem_ctx,
-						 struct policy_handle *domain_handle,
-						 uint16_t level,
-						 struct lsa_String name,
-						 uint32_t *idx);
+						 struct policy_handle *domain_handle /* [in] [ref] */,
+						 uint16_t level /* [in]  */,
+						 struct lsa_String name /* [in]  */,
+						 uint32_t *idx /* [out] [ref] */);
 NTSTATUS rpccli_samr_CreateUser2(struct rpc_pipe_client *cli,
 				 TALLOC_CTX *mem_ctx,
-				 struct policy_handle *domain_handle,
-				 struct lsa_String *account_name,
-				 uint32_t acct_flags,
-				 uint32_t access_mask,
-				 struct policy_handle *user_handle,
-				 uint32_t *access_granted,
-				 uint32_t *rid);
+				 struct policy_handle *domain_handle /* [in] [ref] */,
+				 struct lsa_String *account_name /* [in] [ref] */,
+				 uint32_t acct_flags /* [in]  */,
+				 uint32_t access_mask /* [in]  */,
+				 struct policy_handle *user_handle /* [out] [ref] */,
+				 uint32_t *access_granted /* [out] [ref] */,
+				 uint32_t *rid /* [out] [ref] */);
 NTSTATUS rpccli_samr_QueryDisplayInfo3(struct rpc_pipe_client *cli,
 				       TALLOC_CTX *mem_ctx,
-				       struct policy_handle *domain_handle,
-				       uint16_t level,
-				       uint32_t start_idx,
-				       uint32_t max_entries,
-				       uint32_t buf_size,
-				       uint32_t *total_size,
-				       uint32_t *returned_size,
-				       union samr_DispInfo *info);
+				       struct policy_handle *domain_handle /* [in] [ref] */,
+				       uint16_t level /* [in]  */,
+				       uint32_t start_idx /* [in]  */,
+				       uint32_t max_entries /* [in]  */,
+				       uint32_t buf_size /* [in]  */,
+				       uint32_t *total_size /* [out] [ref] */,
+				       uint32_t *returned_size /* [out] [ref] */,
+				       union samr_DispInfo *info /* [out] [ref,switch_is(level)] */);
 NTSTATUS rpccli_samr_AddMultipleMembersToAlias(struct rpc_pipe_client *cli,
 					       TALLOC_CTX *mem_ctx,
-					       struct policy_handle *alias_handle,
-					       struct lsa_SidArray *sids);
+					       struct policy_handle *alias_handle /* [in] [ref] */,
+					       struct lsa_SidArray *sids /* [in] [ref] */);
 NTSTATUS rpccli_samr_RemoveMultipleMembersFromAlias(struct rpc_pipe_client *cli,
 						    TALLOC_CTX *mem_ctx,
-						    struct policy_handle *alias_handle,
-						    struct lsa_SidArray *sids);
+						    struct policy_handle *alias_handle /* [in] [ref] */,
+						    struct lsa_SidArray *sids /* [in] [ref] */);
 NTSTATUS rpccli_samr_OemChangePasswordUser2(struct rpc_pipe_client *cli,
 					    TALLOC_CTX *mem_ctx,
-					    struct lsa_AsciiString *server,
-					    struct lsa_AsciiString *account,
-					    struct samr_CryptPassword *password,
-					    struct samr_Password *hash);
+					    struct lsa_AsciiString *server /* [in] [unique] */,
+					    struct lsa_AsciiString *account /* [in] [ref] */,
+					    struct samr_CryptPassword *password /* [in] [unique] */,
+					    struct samr_Password *hash /* [in] [unique] */);
 NTSTATUS rpccli_samr_ChangePasswordUser2(struct rpc_pipe_client *cli,
 					 TALLOC_CTX *mem_ctx,
-					 struct lsa_String *server,
-					 struct lsa_String *account,
-					 struct samr_CryptPassword *nt_password,
-					 struct samr_Password *nt_verifier,
-					 uint8_t lm_change,
-					 struct samr_CryptPassword *lm_password,
-					 struct samr_Password *lm_verifier);
+					 struct lsa_String *server /* [in] [unique] */,
+					 struct lsa_String *account /* [in] [ref] */,
+					 struct samr_CryptPassword *nt_password /* [in] [unique] */,
+					 struct samr_Password *nt_verifier /* [in] [unique] */,
+					 uint8_t lm_change /* [in]  */,
+					 struct samr_CryptPassword *lm_password /* [in] [unique] */,
+					 struct samr_Password *lm_verifier /* [in] [unique] */);
 NTSTATUS rpccli_samr_GetDomPwInfo(struct rpc_pipe_client *cli,
 				  TALLOC_CTX *mem_ctx,
-				  struct lsa_String *domain_name,
-				  struct samr_PwInfo *info);
+				  struct lsa_String *domain_name /* [in] [unique] */,
+				  struct samr_PwInfo *info /* [out] [ref] */);
 NTSTATUS rpccli_samr_Connect2(struct rpc_pipe_client *cli,
 			      TALLOC_CTX *mem_ctx,
-			      const char *system_name,
-			      uint32_t access_mask,
-			      struct policy_handle *connect_handle);
+			      const char *system_name /* [in] [unique,charset(UTF16)] */,
+			      uint32_t access_mask /* [in]  */,
+			      struct policy_handle *connect_handle /* [out] [ref] */);
 NTSTATUS rpccli_samr_SetUserInfo2(struct rpc_pipe_client *cli,
 				  TALLOC_CTX *mem_ctx,
-				  struct policy_handle *user_handle,
-				  uint16_t level,
-				  union samr_UserInfo *info);
+				  struct policy_handle *user_handle /* [in] [ref] */,
+				  uint16_t level /* [in]  */,
+				  union samr_UserInfo *info /* [in] [ref,switch_is(level)] */);
 NTSTATUS rpccli_samr_SetBootKeyInformation(struct rpc_pipe_client *cli,
 					   TALLOC_CTX *mem_ctx,
-					   struct policy_handle *connect_handle,
-					   uint32_t unknown1,
-					   uint32_t unknown2,
-					   uint32_t unknown3);
+					   struct policy_handle *connect_handle /* [in] [ref] */,
+					   uint32_t unknown1 /* [in]  */,
+					   uint32_t unknown2 /* [in]  */,
+					   uint32_t unknown3 /* [in]  */);
 NTSTATUS rpccli_samr_GetBootKeyInformation(struct rpc_pipe_client *cli,
 					   TALLOC_CTX *mem_ctx,
-					   struct policy_handle *domain_handle,
-					   uint32_t *unknown);
+					   struct policy_handle *domain_handle /* [in] [ref] */,
+					   uint32_t *unknown /* [out] [ref] */);
 NTSTATUS rpccli_samr_Connect3(struct rpc_pipe_client *cli,
 			      TALLOC_CTX *mem_ctx,
-			      const char *system_name,
-			      uint32_t unknown,
-			      uint32_t access_mask,
-			      struct policy_handle *connect_handle);
+			      const char *system_name /* [in] [unique,charset(UTF16)] */,
+			      uint32_t unknown /* [in]  */,
+			      uint32_t access_mask /* [in]  */,
+			      struct policy_handle *connect_handle /* [out] [ref] */);
 NTSTATUS rpccli_samr_Connect4(struct rpc_pipe_client *cli,
 			      TALLOC_CTX *mem_ctx,
-			      const char *system_name,
-			      enum samr_ConnectVersion client_version,
-			      uint32_t access_mask,
-			      struct policy_handle *connect_handle);
+			      const char *system_name /* [in] [unique,charset(UTF16)] */,
+			      enum samr_ConnectVersion client_version /* [in]  */,
+			      uint32_t access_mask /* [in]  */,
+			      struct policy_handle *connect_handle /* [out] [ref] */);
 NTSTATUS rpccli_samr_ChangePasswordUser3(struct rpc_pipe_client *cli,
 					 TALLOC_CTX *mem_ctx,
-					 struct lsa_String *server,
-					 struct lsa_String *account,
-					 struct samr_CryptPassword *nt_password,
-					 struct samr_Password *nt_verifier,
-					 uint8_t lm_change,
-					 struct samr_CryptPassword *lm_password,
-					 struct samr_Password *lm_verifier,
-					 struct samr_CryptPassword *password3,
-					 struct samr_DomInfo1 **dominfo,
-					 struct samr_ChangeReject **reject);
+					 struct lsa_String *server /* [in] [unique] */,
+					 struct lsa_String *account /* [in] [ref] */,
+					 struct samr_CryptPassword *nt_password /* [in] [unique] */,
+					 struct samr_Password *nt_verifier /* [in] [unique] */,
+					 uint8_t lm_change /* [in]  */,
+					 struct samr_CryptPassword *lm_password /* [in] [unique] */,
+					 struct samr_Password *lm_verifier /* [in] [unique] */,
+					 struct samr_CryptPassword *password3 /* [in] [unique] */,
+					 struct samr_DomInfo1 **dominfo /* [out] [ref] */,
+					 struct samr_ChangeReject **reject /* [out] [ref] */);
 NTSTATUS rpccli_samr_Connect5(struct rpc_pipe_client *cli,
 			      TALLOC_CTX *mem_ctx,
-			      const char *system_name,
-			      uint32_t access_mask,
-			      uint32_t level_in,
-			      union samr_ConnectInfo *info_in,
-			      uint32_t *level_out,
-			      union samr_ConnectInfo *info_out,
-			      struct policy_handle *connect_handle);
+			      const char *system_name /* [in] [unique,charset(UTF16)] */,
+			      uint32_t access_mask /* [in]  */,
+			      uint32_t level_in /* [in]  */,
+			      union samr_ConnectInfo *info_in /* [in] [ref,switch_is(level_in)] */,
+			      uint32_t *level_out /* [out] [ref] */,
+			      union samr_ConnectInfo *info_out /* [out] [ref,switch_is(*level_out)] */,
+			      struct policy_handle *connect_handle /* [out] [ref] */);
 NTSTATUS rpccli_samr_RidToSid(struct rpc_pipe_client *cli,
 			      TALLOC_CTX *mem_ctx,
-			      struct policy_handle *domain_handle,
-			      uint32_t rid,
-			      struct dom_sid2 *sid);
+			      struct policy_handle *domain_handle /* [in] [ref] */,
+			      uint32_t rid /* [in]  */,
+			      struct dom_sid2 *sid /* [out] [ref] */);
 NTSTATUS rpccli_samr_SetDsrmPassword(struct rpc_pipe_client *cli,
 				     TALLOC_CTX *mem_ctx,
-				     struct lsa_String *name,
-				     uint32_t unknown,
-				     struct samr_Password *hash);
+				     struct lsa_String *name /* [in] [unique] */,
+				     uint32_t unknown /* [in]  */,
+				     struct samr_Password *hash /* [in] [unique] */);
 NTSTATUS rpccli_samr_ValidatePassword(struct rpc_pipe_client *cli,
 				      TALLOC_CTX *mem_ctx,
-				      enum samr_ValidatePasswordLevel level,
-				      union samr_ValidatePasswordReq req,
-				      union samr_ValidatePasswordRep *rep);
+				      enum samr_ValidatePasswordLevel level /* [in]  */,
+				      union samr_ValidatePasswordReq req /* [in] [switch_is(level)] */,
+				      union samr_ValidatePasswordRep *rep /* [out] [ref,switch_is(level)] */);
 #endif /* __CLI_SAMR__ */
diff --git a/source3/librpc/gen_ndr/cli_srvsvc.c b/source3/librpc/gen_ndr/cli_srvsvc.c
index 0854fb8b39..291e3efa69 100644
--- a/source3/librpc/gen_ndr/cli_srvsvc.c
+++ b/source3/librpc/gen_ndr/cli_srvsvc.c
@@ -8,12 +8,12 @@
 
 NTSTATUS rpccli_srvsvc_NetCharDevEnum(struct rpc_pipe_client *cli,
 				      TALLOC_CTX *mem_ctx,
-				      const char *server_unc,
-				      uint32_t *level,
-				      union srvsvc_NetCharDevCtr *ctr,
-				      uint32_t max_buffer,
-				      uint32_t *totalentries,
-				      uint32_t *resume_handle,
+				      const char *server_unc /* [in] [unique,charset(UTF16)] */,
+				      uint32_t *level /* [in,out] [ref] */,
+				      union srvsvc_NetCharDevCtr *ctr /* [in,out] [ref,switch_is(*level)] */,
+				      uint32_t max_buffer /* [in]  */,
+				      uint32_t *totalentries /* [out] [ref] */,
+				      uint32_t *resume_handle /* [in,out] [unique] */,
 				      WERROR *werror)
 {
 	struct srvsvc_NetCharDevEnum r;
@@ -67,10 +67,10 @@ NTSTATUS rpccli_srvsvc_NetCharDevEnum(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_srvsvc_NetCharDevGetInfo(struct rpc_pipe_client *cli,
 					 TALLOC_CTX *mem_ctx,
-					 const char *server_unc,
-					 const char *device_name,
-					 uint32_t level,
-					 union srvsvc_NetCharDevInfo *info,
+					 const char *server_unc /* [in] [unique,charset(UTF16)] */,
+					 const char *device_name /* [in] [charset(UTF16)] */,
+					 uint32_t level /* [in]  */,
+					 union srvsvc_NetCharDevInfo *info /* [out] [ref,switch_is(level)] */,
 					 WERROR *werror)
 {
 	struct srvsvc_NetCharDevGetInfo r;
@@ -117,9 +117,9 @@ NTSTATUS rpccli_srvsvc_NetCharDevGetInfo(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_srvsvc_NetCharDevControl(struct rpc_pipe_client *cli,
 					 TALLOC_CTX *mem_ctx,
-					 const char *server_unc,
-					 const char *device_name,
-					 uint32_t opcode,
+					 const char *server_unc /* [in] [unique,charset(UTF16)] */,
+					 const char *device_name /* [in] [charset(UTF16)] */,
+					 uint32_t opcode /* [in]  */,
 					 WERROR *werror)
 {
 	struct srvsvc_NetCharDevControl r;
@@ -165,13 +165,13 @@ NTSTATUS rpccli_srvsvc_NetCharDevControl(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_srvsvc_NetCharDevQEnum(struct rpc_pipe_client *cli,
 				       TALLOC_CTX *mem_ctx,
-				       const char *server_unc,
-				       const char *user,
-				       uint32_t *level,
-				       union srvsvc_NetCharDevQCtr *ctr,
-				       uint32_t max_buffer,
-				       uint32_t *totalentries,
-				       uint32_t *resume_handle,
+				       const char *server_unc /* [in] [unique,charset(UTF16)] */,
+				       const char *user /* [in] [unique,charset(UTF16)] */,
+				       uint32_t *level /* [in,out] [ref] */,
+				       union srvsvc_NetCharDevQCtr *ctr /* [in,out] [ref,switch_is(*level)] */,
+				       uint32_t max_buffer /* [in]  */,
+				       uint32_t *totalentries /* [out] [ref] */,
+				       uint32_t *resume_handle /* [in,out] [unique] */,
 				       WERROR *werror)
 {
 	struct srvsvc_NetCharDevQEnum r;
@@ -226,11 +226,11 @@ NTSTATUS rpccli_srvsvc_NetCharDevQEnum(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_srvsvc_NetCharDevQGetInfo(struct rpc_pipe_client *cli,
 					  TALLOC_CTX *mem_ctx,
-					  const char *server_unc,
-					  const char *queue_name,
-					  const char *user,
-					  uint32_t level,
-					  union srvsvc_NetCharDevQInfo *info,
+					  const char *server_unc /* [in] [unique,charset(UTF16)] */,
+					  const char *queue_name /* [in] [charset(UTF16)] */,
+					  const char *user /* [in] [charset(UTF16)] */,
+					  uint32_t level /* [in]  */,
+					  union srvsvc_NetCharDevQInfo *info /* [out] [ref,switch_is(level)] */,
 					  WERROR *werror)
 {
 	struct srvsvc_NetCharDevQGetInfo r;
@@ -278,11 +278,11 @@ NTSTATUS rpccli_srvsvc_NetCharDevQGetInfo(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_srvsvc_NetCharDevQSetInfo(struct rpc_pipe_client *cli,
 					  TALLOC_CTX *mem_ctx,
-					  const char *server_unc,
-					  const char *queue_name,
-					  uint32_t level,
-					  union srvsvc_NetCharDevQInfo info,
-					  uint32_t *parm_error,
+					  const char *server_unc /* [in] [unique,charset(UTF16)] */,
+					  const char *queue_name /* [in] [charset(UTF16)] */,
+					  uint32_t level /* [in]  */,
+					  union srvsvc_NetCharDevQInfo info /* [in] [switch_is(level)] */,
+					  uint32_t *parm_error /* [in,out] [unique] */,
 					  WERROR *werror)
 {
 	struct srvsvc_NetCharDevQSetInfo r;
@@ -333,8 +333,8 @@ NTSTATUS rpccli_srvsvc_NetCharDevQSetInfo(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_srvsvc_NetCharDevQPurge(struct rpc_pipe_client *cli,
 					TALLOC_CTX *mem_ctx,
-					const char *server_unc,
-					const char *queue_name,
+					const char *server_unc /* [in] [unique,charset(UTF16)] */,
+					const char *queue_name /* [in] [charset(UTF16)] */,
 					WERROR *werror)
 {
 	struct srvsvc_NetCharDevQPurge r;
@@ -379,9 +379,9 @@ NTSTATUS rpccli_srvsvc_NetCharDevQPurge(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_srvsvc_NetCharDevQPurgeSelf(struct rpc_pipe_client *cli,
 					    TALLOC_CTX *mem_ctx,
-					    const char *server_unc,
-					    const char *queue_name,
-					    const char *computer_name,
+					    const char *server_unc /* [in] [unique,charset(UTF16)] */,
+					    const char *queue_name /* [in] [charset(UTF16)] */,
+					    const char *computer_name /* [in] [charset(UTF16)] */,
 					    WERROR *werror)
 {
 	struct srvsvc_NetCharDevQPurgeSelf r;
@@ -427,12 +427,12 @@ NTSTATUS rpccli_srvsvc_NetCharDevQPurgeSelf(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_srvsvc_NetConnEnum(struct rpc_pipe_client *cli,
 				   TALLOC_CTX *mem_ctx,
-				   const char *server_unc,
-				   const char *path,
-				   struct srvsvc_NetConnInfoCtr *info_ctr,
-				   uint32_t max_buffer,
-				   uint32_t *totalentries,
-				   uint32_t *resume_handle,
+				   const char *server_unc /* [in] [unique,charset(UTF16)] */,
+				   const char *path /* [in] [unique,charset(UTF16)] */,
+				   struct srvsvc_NetConnInfoCtr *info_ctr /* [in,out] [ref] */,
+				   uint32_t max_buffer /* [in]  */,
+				   uint32_t *totalentries /* [out] [ref] */,
+				   uint32_t *resume_handle /* [in,out] [unique] */,
 				   WERROR *werror)
 {
 	struct srvsvc_NetConnEnum r;
@@ -485,13 +485,13 @@ NTSTATUS rpccli_srvsvc_NetConnEnum(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_srvsvc_NetFileEnum(struct rpc_pipe_client *cli,
 				   TALLOC_CTX *mem_ctx,
-				   const char *server_unc,
-				   const char *path,
-				   const char *user,
-				   struct srvsvc_NetFileInfoCtr *info_ctr,
-				   uint32_t max_buffer,
-				   uint32_t *totalentries,
-				   uint32_t *resume_handle,
+				   const char *server_unc /* [in] [unique,charset(UTF16)] */,
+				   const char *path /* [in] [unique,charset(UTF16)] */,
+				   const char *user /* [in] [unique,charset(UTF16)] */,
+				   struct srvsvc_NetFileInfoCtr *info_ctr /* [in,out] [ref] */,
+				   uint32_t max_buffer /* [in]  */,
+				   uint32_t *totalentries /* [out] [ref] */,
+				   uint32_t *resume_handle /* [in,out] [unique] */,
 				   WERROR *werror)
 {
 	struct srvsvc_NetFileEnum r;
@@ -545,10 +545,10 @@ NTSTATUS rpccli_srvsvc_NetFileEnum(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_srvsvc_NetFileGetInfo(struct rpc_pipe_client *cli,
 				      TALLOC_CTX *mem_ctx,
-				      const char *server_unc,
-				      uint32_t fid,
-				      uint32_t level,
-				      union srvsvc_NetFileInfo *info,
+				      const char *server_unc /* [in] [unique,charset(UTF16)] */,
+				      uint32_t fid /* [in]  */,
+				      uint32_t level /* [in]  */,
+				      union srvsvc_NetFileInfo *info /* [out] [ref,switch_is(level)] */,
 				      WERROR *werror)
 {
 	struct srvsvc_NetFileGetInfo r;
@@ -595,8 +595,8 @@ NTSTATUS rpccli_srvsvc_NetFileGetInfo(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_srvsvc_NetFileClose(struct rpc_pipe_client *cli,
 				    TALLOC_CTX *mem_ctx,
-				    const char *server_unc,
-				    uint32_t fid,
+				    const char *server_unc /* [in] [unique,charset(UTF16)] */,
+				    uint32_t fid /* [in]  */,
 				    WERROR *werror)
 {
 	struct srvsvc_NetFileClose r;
@@ -641,13 +641,13 @@ NTSTATUS rpccli_srvsvc_NetFileClose(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_srvsvc_NetSessEnum(struct rpc_pipe_client *cli,
 				   TALLOC_CTX *mem_ctx,
-				   const char *server_unc,
-				   const char *client,
-				   const char *user,
-				   struct srvsvc_NetSessInfoCtr *info_ctr,
-				   uint32_t max_buffer,
-				   uint32_t *totalentries,
-				   uint32_t *resume_handle,
+				   const char *server_unc /* [in] [unique,charset(UTF16)] */,
+				   const char *client /* [in] [unique,charset(UTF16)] */,
+				   const char *user /* [in] [unique,charset(UTF16)] */,
+				   struct srvsvc_NetSessInfoCtr *info_ctr /* [in,out] [ref] */,
+				   uint32_t max_buffer /* [in]  */,
+				   uint32_t *totalentries /* [out] [ref] */,
+				   uint32_t *resume_handle /* [in,out] [unique] */,
 				   WERROR *werror)
 {
 	struct srvsvc_NetSessEnum r;
@@ -701,9 +701,9 @@ NTSTATUS rpccli_srvsvc_NetSessEnum(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_srvsvc_NetSessDel(struct rpc_pipe_client *cli,
 				  TALLOC_CTX *mem_ctx,
-				  const char *server_unc,
-				  const char *client,
-				  const char *user,
+				  const char *server_unc /* [in] [unique,charset(UTF16)] */,
+				  const char *client /* [in] [unique,charset(UTF16)] */,
+				  const char *user /* [in] [unique,charset(UTF16)] */,
 				  WERROR *werror)
 {
 	struct srvsvc_NetSessDel r;
@@ -749,10 +749,10 @@ NTSTATUS rpccli_srvsvc_NetSessDel(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_srvsvc_NetShareAdd(struct rpc_pipe_client *cli,
 				   TALLOC_CTX *mem_ctx,
-				   const char *server_unc,
-				   uint32_t level,
-				   union srvsvc_NetShareInfo *info,
-				   uint32_t *parm_error,
+				   const char *server_unc /* [in] [unique,charset(UTF16)] */,
+				   uint32_t level /* [in]  */,
+				   union srvsvc_NetShareInfo *info /* [in] [ref,switch_is(level)] */,
+				   uint32_t *parm_error /* [in,out] [unique] */,
 				   WERROR *werror)
 {
 	struct srvsvc_NetShareAdd r;
@@ -802,11 +802,11 @@ NTSTATUS rpccli_srvsvc_NetShareAdd(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_srvsvc_NetShareEnumAll(struct rpc_pipe_client *cli,
 				       TALLOC_CTX *mem_ctx,
-				       const char *server_unc,
-				       struct srvsvc_NetShareInfoCtr *info_ctr,
-				       uint32_t max_buffer,
-				       uint32_t *totalentries,
-				       uint32_t *resume_handle,
+				       const char *server_unc /* [in] [unique,charset(UTF16)] */,
+				       struct srvsvc_NetShareInfoCtr *info_ctr /* [in,out] [ref] */,
+				       uint32_t max_buffer /* [in]  */,
+				       uint32_t *totalentries /* [out] [ref] */,
+				       uint32_t *resume_handle /* [in,out] [unique] */,
 				       WERROR *werror)
 {
 	struct srvsvc_NetShareEnumAll r;
@@ -858,10 +858,10 @@ NTSTATUS rpccli_srvsvc_NetShareEnumAll(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_srvsvc_NetShareGetInfo(struct rpc_pipe_client *cli,
 				       TALLOC_CTX *mem_ctx,
-				       const char *server_unc,
-				       const char *share_name,
-				       uint32_t level,
-				       union srvsvc_NetShareInfo *info,
+				       const char *server_unc /* [in] [unique,charset(UTF16)] */,
+				       const char *share_name /* [in] [charset(UTF16)] */,
+				       uint32_t level /* [in]  */,
+				       union srvsvc_NetShareInfo *info /* [out] [ref,switch_is(level)] */,
 				       WERROR *werror)
 {
 	struct srvsvc_NetShareGetInfo r;
@@ -908,11 +908,11 @@ NTSTATUS rpccli_srvsvc_NetShareGetInfo(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_srvsvc_NetShareSetInfo(struct rpc_pipe_client *cli,
 				       TALLOC_CTX *mem_ctx,
-				       const char *server_unc,
-				       const char *share_name,
-				       uint32_t level,
-				       union srvsvc_NetShareInfo *info,
-				       uint32_t *parm_error,
+				       const char *server_unc /* [in] [unique,charset(UTF16)] */,
+				       const char *share_name /* [in] [charset(UTF16)] */,
+				       uint32_t level /* [in]  */,
+				       union srvsvc_NetShareInfo *info /* [in] [ref,switch_is(level)] */,
+				       uint32_t *parm_error /* [in,out] [unique] */,
 				       WERROR *werror)
 {
 	struct srvsvc_NetShareSetInfo r;
@@ -963,9 +963,9 @@ NTSTATUS rpccli_srvsvc_NetShareSetInfo(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_srvsvc_NetShareDel(struct rpc_pipe_client *cli,
 				   TALLOC_CTX *mem_ctx,
-				   const char *server_unc,
-				   const char *share_name,
-				   uint32_t reserved,
+				   const char *server_unc /* [in] [unique,charset(UTF16)] */,
+				   const char *share_name /* [in] [charset(UTF16)] */,
+				   uint32_t reserved /* [in]  */,
 				   WERROR *werror)
 {
 	struct srvsvc_NetShareDel r;
@@ -1011,9 +1011,9 @@ NTSTATUS rpccli_srvsvc_NetShareDel(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_srvsvc_NetShareDelSticky(struct rpc_pipe_client *cli,
 					 TALLOC_CTX *mem_ctx,
-					 const char *server_unc,
-					 const char *share_name,
-					 uint32_t reserved,
+					 const char *server_unc /* [in] [unique,charset(UTF16)] */,
+					 const char *share_name /* [in] [charset(UTF16)] */,
+					 uint32_t reserved /* [in]  */,
 					 WERROR *werror)
 {
 	struct srvsvc_NetShareDelSticky r;
@@ -1059,9 +1059,9 @@ NTSTATUS rpccli_srvsvc_NetShareDelSticky(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_srvsvc_NetShareCheck(struct rpc_pipe_client *cli,
 				     TALLOC_CTX *mem_ctx,
-				     const char *server_unc,
-				     const char *device_name,
-				     enum srvsvc_ShareType *type,
+				     const char *server_unc /* [in] [unique,charset(UTF16)] */,
+				     const char *device_name /* [in] [charset(UTF16)] */,
+				     enum srvsvc_ShareType *type /* [out] [ref] */,
 				     WERROR *werror)
 {
 	struct srvsvc_NetShareCheck r;
@@ -1107,9 +1107,9 @@ NTSTATUS rpccli_srvsvc_NetShareCheck(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_srvsvc_NetSrvGetInfo(struct rpc_pipe_client *cli,
 				     TALLOC_CTX *mem_ctx,
-				     const char *server_unc,
-				     uint32_t level,
-				     union srvsvc_NetSrvInfo *info,
+				     const char *server_unc /* [in] [unique,charset(UTF16)] */,
+				     uint32_t level /* [in]  */,
+				     union srvsvc_NetSrvInfo *info /* [out] [ref,switch_is(level)] */,
 				     WERROR *werror)
 {
 	struct srvsvc_NetSrvGetInfo r;
@@ -1155,10 +1155,10 @@ NTSTATUS rpccli_srvsvc_NetSrvGetInfo(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_srvsvc_NetSrvSetInfo(struct rpc_pipe_client *cli,
 				     TALLOC_CTX *mem_ctx,
-				     const char *server_unc,
-				     uint32_t level,
-				     union srvsvc_NetSrvInfo *info,
-				     uint32_t *parm_error,
+				     const char *server_unc /* [in] [unique,charset(UTF16)] */,
+				     uint32_t level /* [in]  */,
+				     union srvsvc_NetSrvInfo *info /* [in] [ref,switch_is(level)] */,
+				     uint32_t *parm_error /* [in,out] [unique] */,
 				     WERROR *werror)
 {
 	struct srvsvc_NetSrvSetInfo r;
@@ -1208,12 +1208,12 @@ NTSTATUS rpccli_srvsvc_NetSrvSetInfo(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_srvsvc_NetDiskEnum(struct rpc_pipe_client *cli,
 				   TALLOC_CTX *mem_ctx,
-				   const char *server_unc,
-				   uint32_t level,
-				   struct srvsvc_NetDiskInfo *info,
-				   uint32_t maxlen,
-				   uint32_t *totalentries,
-				   uint32_t *resume_handle,
+				   const char *server_unc /* [in] [unique,charset(UTF16)] */,
+				   uint32_t level /* [in]  */,
+				   struct srvsvc_NetDiskInfo *info /* [in,out] [ref] */,
+				   uint32_t maxlen /* [in]  */,
+				   uint32_t *totalentries /* [out] [ref] */,
+				   uint32_t *resume_handle /* [in,out] [unique] */,
 				   WERROR *werror)
 {
 	struct srvsvc_NetDiskEnum r;
@@ -1266,11 +1266,11 @@ NTSTATUS rpccli_srvsvc_NetDiskEnum(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_srvsvc_NetServerStatisticsGet(struct rpc_pipe_client *cli,
 					      TALLOC_CTX *mem_ctx,
-					      const char *server_unc,
-					      const char *service,
-					      uint32_t level,
-					      uint32_t options,
-					      struct srvsvc_Statistics *stats,
+					      const char *server_unc /* [in] [unique,charset(UTF16)] */,
+					      const char *service /* [in] [unique,charset(UTF16)] */,
+					      uint32_t level /* [in]  */,
+					      uint32_t options /* [in]  */,
+					      struct srvsvc_Statistics *stats /* [out] [ref] */,
 					      WERROR *werror)
 {
 	struct srvsvc_NetServerStatisticsGet r;
@@ -1318,9 +1318,9 @@ NTSTATUS rpccli_srvsvc_NetServerStatisticsGet(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_srvsvc_NetTransportAdd(struct rpc_pipe_client *cli,
 				       TALLOC_CTX *mem_ctx,
-				       const char *server_unc,
-				       uint32_t level,
-				       union srvsvc_NetTransportInfo info,
+				       const char *server_unc /* [in] [unique,charset(UTF16)] */,
+				       uint32_t level /* [in]  */,
+				       union srvsvc_NetTransportInfo info /* [in] [switch_is(level)] */,
 				       WERROR *werror)
 {
 	struct srvsvc_NetTransportAdd r;
@@ -1366,12 +1366,12 @@ NTSTATUS rpccli_srvsvc_NetTransportAdd(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_srvsvc_NetTransportEnum(struct rpc_pipe_client *cli,
 					TALLOC_CTX *mem_ctx,
-					const char *server_unc,
-					uint32_t *level,
-					union srvsvc_NetTransportCtr *transports,
-					uint32_t max_buffer,
-					uint32_t *totalentries,
-					uint32_t *resume_handle,
+					const char *server_unc /* [in] [unique,charset(UTF16)] */,
+					uint32_t *level /* [in,out] [ref] */,
+					union srvsvc_NetTransportCtr *transports /* [in,out] [ref,switch_is(*level)] */,
+					uint32_t max_buffer /* [in]  */,
+					uint32_t *totalentries /* [out] [ref] */,
+					uint32_t *resume_handle /* [in,out] [unique] */,
 					WERROR *werror)
 {
 	struct srvsvc_NetTransportEnum r;
@@ -1425,9 +1425,9 @@ NTSTATUS rpccli_srvsvc_NetTransportEnum(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_srvsvc_NetTransportDel(struct rpc_pipe_client *cli,
 				       TALLOC_CTX *mem_ctx,
-				       const char *server_unc,
-				       uint32_t unknown,
-				       struct srvsvc_NetTransportInfo0 transport,
+				       const char *server_unc /* [in] [unique,charset(UTF16)] */,
+				       uint32_t unknown /* [in]  */,
+				       struct srvsvc_NetTransportInfo0 transport /* [in]  */,
 				       WERROR *werror)
 {
 	struct srvsvc_NetTransportDel r;
@@ -1473,8 +1473,8 @@ NTSTATUS rpccli_srvsvc_NetTransportDel(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_srvsvc_NetRemoteTOD(struct rpc_pipe_client *cli,
 				    TALLOC_CTX *mem_ctx,
-				    const char *server_unc,
-				    struct srvsvc_NetRemoteTODInfo **info,
+				    const char *server_unc /* [in] [unique,charset(UTF16)] */,
+				    struct srvsvc_NetRemoteTODInfo **info /* [out] [ref] */,
 				    WERROR *werror)
 {
 	struct srvsvc_NetRemoteTOD r;
@@ -1519,10 +1519,10 @@ NTSTATUS rpccli_srvsvc_NetRemoteTOD(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_srvsvc_NetSetServiceBits(struct rpc_pipe_client *cli,
 					 TALLOC_CTX *mem_ctx,
-					 const char *server_unc,
-					 const char *transport,
-					 uint32_t servicebits,
-					 uint32_t updateimmediately,
+					 const char *server_unc /* [in] [unique,charset(UTF16)] */,
+					 const char *transport /* [in] [unique,charset(UTF16)] */,
+					 uint32_t servicebits /* [in]  */,
+					 uint32_t updateimmediately /* [in]  */,
 					 WERROR *werror)
 {
 	struct srvsvc_NetSetServiceBits r;
@@ -1569,10 +1569,10 @@ NTSTATUS rpccli_srvsvc_NetSetServiceBits(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_srvsvc_NetPathType(struct rpc_pipe_client *cli,
 				   TALLOC_CTX *mem_ctx,
-				   const char *server_unc,
-				   const char *path,
-				   uint32_t pathflags,
-				   uint32_t *pathtype,
+				   const char *server_unc /* [in] [unique,charset(UTF16)] */,
+				   const char *path /* [in] [charset(UTF16)] */,
+				   uint32_t pathflags /* [in]  */,
+				   uint32_t *pathtype /* [out] [ref] */,
 				   WERROR *werror)
 {
 	struct srvsvc_NetPathType r;
@@ -1619,13 +1619,13 @@ NTSTATUS rpccli_srvsvc_NetPathType(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_srvsvc_NetPathCanonicalize(struct rpc_pipe_client *cli,
 					   TALLOC_CTX *mem_ctx,
-					   const char *server_unc,
-					   const char *path,
-					   uint8_t *can_path,
-					   uint32_t maxbuf,
-					   const char *prefix,
-					   uint32_t *pathtype,
-					   uint32_t pathflags,
+					   const char *server_unc /* [in] [unique,charset(UTF16)] */,
+					   const char *path /* [in] [charset(UTF16)] */,
+					   uint8_t *can_path /* [out] [size_is(maxbuf)] */,
+					   uint32_t maxbuf /* [in]  */,
+					   const char *prefix /* [in] [charset(UTF16)] */,
+					   uint32_t *pathtype /* [in,out] [ref] */,
+					   uint32_t pathflags /* [in]  */,
 					   WERROR *werror)
 {
 	struct srvsvc_NetPathCanonicalize r;
@@ -1676,11 +1676,11 @@ NTSTATUS rpccli_srvsvc_NetPathCanonicalize(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_srvsvc_NetPathCompare(struct rpc_pipe_client *cli,
 				      TALLOC_CTX *mem_ctx,
-				      const char *server_unc,
-				      const char *path1,
-				      const char *path2,
-				      uint32_t pathtype,
-				      uint32_t pathflags,
+				      const char *server_unc /* [in] [unique,charset(UTF16)] */,
+				      const char *path1 /* [in] [charset(UTF16)] */,
+				      const char *path2 /* [in] [charset(UTF16)] */,
+				      uint32_t pathtype /* [in]  */,
+				      uint32_t pathflags /* [in]  */,
 				      WERROR *werror)
 {
 	struct srvsvc_NetPathCompare r;
@@ -1728,10 +1728,10 @@ NTSTATUS rpccli_srvsvc_NetPathCompare(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_srvsvc_NetNameValidate(struct rpc_pipe_client *cli,
 				       TALLOC_CTX *mem_ctx,
-				       const char *server_unc,
-				       const char *name,
-				       uint32_t name_type,
-				       uint32_t flags,
+				       const char *server_unc /* [in] [unique,charset(UTF16)] */,
+				       const char *name /* [in] [charset(UTF16)] */,
+				       uint32_t name_type /* [in]  */,
+				       uint32_t flags /* [in]  */,
 				       WERROR *werror)
 {
 	struct srvsvc_NetNameValidate r;
@@ -1820,11 +1820,11 @@ NTSTATUS rpccli_srvsvc_NETRPRNAMECANONICALIZE(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_srvsvc_NetPRNameCompare(struct rpc_pipe_client *cli,
 					TALLOC_CTX *mem_ctx,
-					const char *server_unc,
-					const char *name1,
-					const char *name2,
-					uint32_t name_type,
-					uint32_t flags,
+					const char *server_unc /* [in] [unique,charset(UTF16)] */,
+					const char *name1 /* [in] [charset(UTF16)] */,
+					const char *name2 /* [in] [charset(UTF16)] */,
+					uint32_t name_type /* [in]  */,
+					uint32_t flags /* [in]  */,
 					WERROR *werror)
 {
 	struct srvsvc_NetPRNameCompare r;
@@ -1872,11 +1872,11 @@ NTSTATUS rpccli_srvsvc_NetPRNameCompare(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_srvsvc_NetShareEnum(struct rpc_pipe_client *cli,
 				    TALLOC_CTX *mem_ctx,
-				    const char *server_unc,
-				    struct srvsvc_NetShareInfoCtr *info_ctr,
-				    uint32_t max_buffer,
-				    uint32_t *totalentries,
-				    uint32_t *resume_handle,
+				    const char *server_unc /* [in] [unique,charset(UTF16)] */,
+				    struct srvsvc_NetShareInfoCtr *info_ctr /* [in,out] [ref] */,
+				    uint32_t max_buffer /* [in]  */,
+				    uint32_t *totalentries /* [out] [ref] */,
+				    uint32_t *resume_handle /* [in,out] [unique] */,
 				    WERROR *werror)
 {
 	struct srvsvc_NetShareEnum r;
@@ -1928,10 +1928,10 @@ NTSTATUS rpccli_srvsvc_NetShareEnum(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_srvsvc_NetShareDelStart(struct rpc_pipe_client *cli,
 					TALLOC_CTX *mem_ctx,
-					const char *server_unc,
-					const char *share,
-					uint32_t reserved,
-					struct policy_handle *hnd,
+					const char *server_unc /* [in] [unique,charset(UTF16)] */,
+					const char *share /* [in] [charset(UTF16)] */,
+					uint32_t reserved /* [in]  */,
+					struct policy_handle *hnd /* [out] [unique] */,
 					WERROR *werror)
 {
 	struct srvsvc_NetShareDelStart r;
@@ -1980,7 +1980,7 @@ NTSTATUS rpccli_srvsvc_NetShareDelStart(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_srvsvc_NetShareDelCommit(struct rpc_pipe_client *cli,
 					 TALLOC_CTX *mem_ctx,
-					 struct policy_handle *hnd,
+					 struct policy_handle *hnd /* [in,out] [unique] */,
 					 WERROR *werror)
 {
 	struct srvsvc_NetShareDelCommit r;
@@ -2027,11 +2027,11 @@ NTSTATUS rpccli_srvsvc_NetShareDelCommit(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_srvsvc_NetGetFileSecurity(struct rpc_pipe_client *cli,
 					  TALLOC_CTX *mem_ctx,
-					  const char *server_unc,
-					  const char *share,
-					  const char *file,
-					  uint32_t securityinformation,
-					  struct sec_desc_buf **sd_buf,
+					  const char *server_unc /* [in] [unique,charset(UTF16)] */,
+					  const char *share /* [in] [unique,charset(UTF16)] */,
+					  const char *file /* [in] [charset(UTF16)] */,
+					  uint32_t securityinformation /* [in]  */,
+					  struct sec_desc_buf **sd_buf /* [out] [ref] */,
 					  WERROR *werror)
 {
 	struct srvsvc_NetGetFileSecurity r;
@@ -2079,11 +2079,11 @@ NTSTATUS rpccli_srvsvc_NetGetFileSecurity(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_srvsvc_NetSetFileSecurity(struct rpc_pipe_client *cli,
 					  TALLOC_CTX *mem_ctx,
-					  const char *server_unc,
-					  const char *share,
-					  const char *file,
-					  uint32_t securityinformation,
-					  struct sec_desc_buf *sd_buf,
+					  const char *server_unc /* [in] [unique,charset(UTF16)] */,
+					  const char *share /* [in] [unique,charset(UTF16)] */,
+					  const char *file /* [in] [charset(UTF16)] */,
+					  uint32_t securityinformation /* [in]  */,
+					  struct sec_desc_buf *sd_buf /* [in] [ref] */,
 					  WERROR *werror)
 {
 	struct srvsvc_NetSetFileSecurity r;
@@ -2131,9 +2131,9 @@ NTSTATUS rpccli_srvsvc_NetSetFileSecurity(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_srvsvc_NetServerTransportAddEx(struct rpc_pipe_client *cli,
 					       TALLOC_CTX *mem_ctx,
-					       const char *server_unc,
-					       uint32_t level,
-					       union srvsvc_NetTransportInfo info,
+					       const char *server_unc /* [in] [unique,charset(UTF16)] */,
+					       uint32_t level /* [in]  */,
+					       union srvsvc_NetTransportInfo info /* [in] [switch_is(level)] */,
 					       WERROR *werror)
 {
 	struct srvsvc_NetServerTransportAddEx r;
@@ -2179,12 +2179,12 @@ NTSTATUS rpccli_srvsvc_NetServerTransportAddEx(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_srvsvc_NetServerSetServiceBitsEx(struct rpc_pipe_client *cli,
 						 TALLOC_CTX *mem_ctx,
-						 const char *server_unc,
-						 const char *emulated_server_unc,
-						 const char *transport,
-						 uint32_t servicebitsofinterest,
-						 uint32_t servicebits,
-						 uint32_t updateimmediately,
+						 const char *server_unc /* [in] [unique,charset(UTF16)] */,
+						 const char *emulated_server_unc /* [in] [unique,charset(UTF16)] */,
+						 const char *transport /* [in] [unique,charset(UTF16)] */,
+						 uint32_t servicebitsofinterest /* [in]  */,
+						 uint32_t servicebits /* [in]  */,
+						 uint32_t updateimmediately /* [in]  */,
 						 WERROR *werror)
 {
 	struct srvsvc_NetServerSetServiceBitsEx r;
diff --git a/source3/librpc/gen_ndr/cli_srvsvc.h b/source3/librpc/gen_ndr/cli_srvsvc.h
index d481858631..4ab4734de5 100644
--- a/source3/librpc/gen_ndr/cli_srvsvc.h
+++ b/source3/librpc/gen_ndr/cli_srvsvc.h
@@ -3,313 +3,313 @@
 #define __CLI_SRVSVC__
 NTSTATUS rpccli_srvsvc_NetCharDevEnum(struct rpc_pipe_client *cli,
 				      TALLOC_CTX *mem_ctx,
-				      const char *server_unc,
-				      uint32_t *level,
-				      union srvsvc_NetCharDevCtr *ctr,
-				      uint32_t max_buffer,
-				      uint32_t *totalentries,
-				      uint32_t *resume_handle,
+				      const char *server_unc /* [in] [unique,charset(UTF16)] */,
+				      uint32_t *level /* [in,out] [ref] */,
+				      union srvsvc_NetCharDevCtr *ctr /* [in,out] [ref,switch_is(*level)] */,
+				      uint32_t max_buffer /* [in]  */,
+				      uint32_t *totalentries /* [out] [ref] */,
+				      uint32_t *resume_handle /* [in,out] [unique] */,
 				      WERROR *werror);
 NTSTATUS rpccli_srvsvc_NetCharDevGetInfo(struct rpc_pipe_client *cli,
 					 TALLOC_CTX *mem_ctx,
-					 const char *server_unc,
-					 const char *device_name,
-					 uint32_t level,
-					 union srvsvc_NetCharDevInfo *info,
+					 const char *server_unc /* [in] [unique,charset(UTF16)] */,
+					 const char *device_name /* [in] [charset(UTF16)] */,
+					 uint32_t level /* [in]  */,
+					 union srvsvc_NetCharDevInfo *info /* [out] [ref,switch_is(level)] */,
 					 WERROR *werror);
 NTSTATUS rpccli_srvsvc_NetCharDevControl(struct rpc_pipe_client *cli,
 					 TALLOC_CTX *mem_ctx,
-					 const char *server_unc,
-					 const char *device_name,
-					 uint32_t opcode,
+					 const char *server_unc /* [in] [unique,charset(UTF16)] */,
+					 const char *device_name /* [in] [charset(UTF16)] */,
+					 uint32_t opcode /* [in]  */,
 					 WERROR *werror);
 NTSTATUS rpccli_srvsvc_NetCharDevQEnum(struct rpc_pipe_client *cli,
 				       TALLOC_CTX *mem_ctx,
-				       const char *server_unc,
-				       const char *user,
-				       uint32_t *level,
-				       union srvsvc_NetCharDevQCtr *ctr,
-				       uint32_t max_buffer,
-				       uint32_t *totalentries,
-				       uint32_t *resume_handle,
+				       const char *server_unc /* [in] [unique,charset(UTF16)] */,
+				       const char *user /* [in] [unique,charset(UTF16)] */,
+				       uint32_t *level /* [in,out] [ref] */,
+				       union srvsvc_NetCharDevQCtr *ctr /* [in,out] [ref,switch_is(*level)] */,
+				       uint32_t max_buffer /* [in]  */,
+				       uint32_t *totalentries /* [out] [ref] */,
+				       uint32_t *resume_handle /* [in,out] [unique] */,
 				       WERROR *werror);
 NTSTATUS rpccli_srvsvc_NetCharDevQGetInfo(struct rpc_pipe_client *cli,
 					  TALLOC_CTX *mem_ctx,
-					  const char *server_unc,
-					  const char *queue_name,
-					  const char *user,
-					  uint32_t level,
-					  union srvsvc_NetCharDevQInfo *info,
+					  const char *server_unc /* [in] [unique,charset(UTF16)] */,
+					  const char *queue_name /* [in] [charset(UTF16)] */,
+					  const char *user /* [in] [charset(UTF16)] */,
+					  uint32_t level /* [in]  */,
+					  union srvsvc_NetCharDevQInfo *info /* [out] [ref,switch_is(level)] */,
 					  WERROR *werror);
 NTSTATUS rpccli_srvsvc_NetCharDevQSetInfo(struct rpc_pipe_client *cli,
 					  TALLOC_CTX *mem_ctx,
-					  const char *server_unc,
-					  const char *queue_name,
-					  uint32_t level,
-					  union srvsvc_NetCharDevQInfo info,
-					  uint32_t *parm_error,
+					  const char *server_unc /* [in] [unique,charset(UTF16)] */,
+					  const char *queue_name /* [in] [charset(UTF16)] */,
+					  uint32_t level /* [in]  */,
+					  union srvsvc_NetCharDevQInfo info /* [in] [switch_is(level)] */,
+					  uint32_t *parm_error /* [in,out] [unique] */,
 					  WERROR *werror);
 NTSTATUS rpccli_srvsvc_NetCharDevQPurge(struct rpc_pipe_client *cli,
 					TALLOC_CTX *mem_ctx,
-					const char *server_unc,
-					const char *queue_name,
+					const char *server_unc /* [in] [unique,charset(UTF16)] */,
+					const char *queue_name /* [in] [charset(UTF16)] */,
 					WERROR *werror);
 NTSTATUS rpccli_srvsvc_NetCharDevQPurgeSelf(struct rpc_pipe_client *cli,
 					    TALLOC_CTX *mem_ctx,
-					    const char *server_unc,
-					    const char *queue_name,
-					    const char *computer_name,
+					    const char *server_unc /* [in] [unique,charset(UTF16)] */,
+					    const char *queue_name /* [in] [charset(UTF16)] */,
+					    const char *computer_name /* [in] [charset(UTF16)] */,
 					    WERROR *werror);
 NTSTATUS rpccli_srvsvc_NetConnEnum(struct rpc_pipe_client *cli,
 				   TALLOC_CTX *mem_ctx,
-				   const char *server_unc,
-				   const char *path,
-				   struct srvsvc_NetConnInfoCtr *info_ctr,
-				   uint32_t max_buffer,
-				   uint32_t *totalentries,
-				   uint32_t *resume_handle,
+				   const char *server_unc /* [in] [unique,charset(UTF16)] */,
+				   const char *path /* [in] [unique,charset(UTF16)] */,
+				   struct srvsvc_NetConnInfoCtr *info_ctr /* [in,out] [ref] */,
+				   uint32_t max_buffer /* [in]  */,
+				   uint32_t *totalentries /* [out] [ref] */,
+				   uint32_t *resume_handle /* [in,out] [unique] */,
 				   WERROR *werror);
 NTSTATUS rpccli_srvsvc_NetFileEnum(struct rpc_pipe_client *cli,
 				   TALLOC_CTX *mem_ctx,
-				   const char *server_unc,
-				   const char *path,
-				   const char *user,
-				   struct srvsvc_NetFileInfoCtr *info_ctr,
-				   uint32_t max_buffer,
-				   uint32_t *totalentries,
-				   uint32_t *resume_handle,
+				   const char *server_unc /* [in] [unique,charset(UTF16)] */,
+				   const char *path /* [in] [unique,charset(UTF16)] */,
+				   const char *user /* [in] [unique,charset(UTF16)] */,
+				   struct srvsvc_NetFileInfoCtr *info_ctr /* [in,out] [ref] */,
+				   uint32_t max_buffer /* [in]  */,
+				   uint32_t *totalentries /* [out] [ref] */,
+				   uint32_t *resume_handle /* [in,out] [unique] */,
 				   WERROR *werror);
 NTSTATUS rpccli_srvsvc_NetFileGetInfo(struct rpc_pipe_client *cli,
 				      TALLOC_CTX *mem_ctx,
-				      const char *server_unc,
-				      uint32_t fid,
-				      uint32_t level,
-				      union srvsvc_NetFileInfo *info,
+				      const char *server_unc /* [in] [unique,charset(UTF16)] */,
+				      uint32_t fid /* [in]  */,
+				      uint32_t level /* [in]  */,
+				      union srvsvc_NetFileInfo *info /* [out] [ref,switch_is(level)] */,
 				      WERROR *werror);
 NTSTATUS rpccli_srvsvc_NetFileClose(struct rpc_pipe_client *cli,
 				    TALLOC_CTX *mem_ctx,
-				    const char *server_unc,
-				    uint32_t fid,
+				    const char *server_unc /* [in] [unique,charset(UTF16)] */,
+				    uint32_t fid /* [in]  */,
 				    WERROR *werror);
 NTSTATUS rpccli_srvsvc_NetSessEnum(struct rpc_pipe_client *cli,
 				   TALLOC_CTX *mem_ctx,
-				   const char *server_unc,
-				   const char *client,
-				   const char *user,
-				   struct srvsvc_NetSessInfoCtr *info_ctr,
-				   uint32_t max_buffer,
-				   uint32_t *totalentries,
-				   uint32_t *resume_handle,
+				   const char *server_unc /* [in] [unique,charset(UTF16)] */,
+				   const char *client /* [in] [unique,charset(UTF16)] */,
+				   const char *user /* [in] [unique,charset(UTF16)] */,
+				   struct srvsvc_NetSessInfoCtr *info_ctr /* [in,out] [ref] */,
+				   uint32_t max_buffer /* [in]  */,
+				   uint32_t *totalentries /* [out] [ref] */,
+				   uint32_t *resume_handle /* [in,out] [unique] */,
 				   WERROR *werror);
 NTSTATUS rpccli_srvsvc_NetSessDel(struct rpc_pipe_client *cli,
 				  TALLOC_CTX *mem_ctx,
-				  const char *server_unc,
-				  const char *client,
-				  const char *user,
+				  const char *server_unc /* [in] [unique,charset(UTF16)] */,
+				  const char *client /* [in] [unique,charset(UTF16)] */,
+				  const char *user /* [in] [unique,charset(UTF16)] */,
 				  WERROR *werror);
 NTSTATUS rpccli_srvsvc_NetShareAdd(struct rpc_pipe_client *cli,
 				   TALLOC_CTX *mem_ctx,
-				   const char *server_unc,
-				   uint32_t level,
-				   union srvsvc_NetShareInfo *info,
-				   uint32_t *parm_error,
+				   const char *server_unc /* [in] [unique,charset(UTF16)] */,
+				   uint32_t level /* [in]  */,
+				   union srvsvc_NetShareInfo *info /* [in] [ref,switch_is(level)] */,
+				   uint32_t *parm_error /* [in,out] [unique] */,
 				   WERROR *werror);
 NTSTATUS rpccli_srvsvc_NetShareEnumAll(struct rpc_pipe_client *cli,
 				       TALLOC_CTX *mem_ctx,
-				       const char *server_unc,
-				       struct srvsvc_NetShareInfoCtr *info_ctr,
-				       uint32_t max_buffer,
-				       uint32_t *totalentries,
-				       uint32_t *resume_handle,
+				       const char *server_unc /* [in] [unique,charset(UTF16)] */,
+				       struct srvsvc_NetShareInfoCtr *info_ctr /* [in,out] [ref] */,
+				       uint32_t max_buffer /* [in]  */,
+				       uint32_t *totalentries /* [out] [ref] */,
+				       uint32_t *resume_handle /* [in,out] [unique] */,
 				       WERROR *werror);
 NTSTATUS rpccli_srvsvc_NetShareGetInfo(struct rpc_pipe_client *cli,
 				       TALLOC_CTX *mem_ctx,
-				       const char *server_unc,
-				       const char *share_name,
-				       uint32_t level,
-				       union srvsvc_NetShareInfo *info,
+				       const char *server_unc /* [in] [unique,charset(UTF16)] */,
+				       const char *share_name /* [in] [charset(UTF16)] */,
+				       uint32_t level /* [in]  */,
+				       union srvsvc_NetShareInfo *info /* [out] [ref,switch_is(level)] */,
 				       WERROR *werror);
 NTSTATUS rpccli_srvsvc_NetShareSetInfo(struct rpc_pipe_client *cli,
 				       TALLOC_CTX *mem_ctx,
-				       const char *server_unc,
-				       const char *share_name,
-				       uint32_t level,
-				       union srvsvc_NetShareInfo *info,
-				       uint32_t *parm_error,
+				       const char *server_unc /* [in] [unique,charset(UTF16)] */,
+				       const char *share_name /* [in] [charset(UTF16)] */,
+				       uint32_t level /* [in]  */,
+				       union srvsvc_NetShareInfo *info /* [in] [ref,switch_is(level)] */,
+				       uint32_t *parm_error /* [in,out] [unique] */,
 				       WERROR *werror);
 NTSTATUS rpccli_srvsvc_NetShareDel(struct rpc_pipe_client *cli,
 				   TALLOC_CTX *mem_ctx,
-				   const char *server_unc,
-				   const char *share_name,
-				   uint32_t reserved,
+				   const char *server_unc /* [in] [unique,charset(UTF16)] */,
+				   const char *share_name /* [in] [charset(UTF16)] */,
+				   uint32_t reserved /* [in]  */,
 				   WERROR *werror);
 NTSTATUS rpccli_srvsvc_NetShareDelSticky(struct rpc_pipe_client *cli,
 					 TALLOC_CTX *mem_ctx,
-					 const char *server_unc,
-					 const char *share_name,
-					 uint32_t reserved,
+					 const char *server_unc /* [in] [unique,charset(UTF16)] */,
+					 const char *share_name /* [in] [charset(UTF16)] */,
+					 uint32_t reserved /* [in]  */,
 					 WERROR *werror);
 NTSTATUS rpccli_srvsvc_NetShareCheck(struct rpc_pipe_client *cli,
 				     TALLOC_CTX *mem_ctx,
-				     const char *server_unc,
-				     const char *device_name,
-				     enum srvsvc_ShareType *type,
+				     const char *server_unc /* [in] [unique,charset(UTF16)] */,
+				     const char *device_name /* [in] [charset(UTF16)] */,
+				     enum srvsvc_ShareType *type /* [out] [ref] */,
 				     WERROR *werror);
 NTSTATUS rpccli_srvsvc_NetSrvGetInfo(struct rpc_pipe_client *cli,
 				     TALLOC_CTX *mem_ctx,
-				     const char *server_unc,
-				     uint32_t level,
-				     union srvsvc_NetSrvInfo *info,
+				     const char *server_unc /* [in] [unique,charset(UTF16)] */,
+				     uint32_t level /* [in]  */,
+				     union srvsvc_NetSrvInfo *info /* [out] [ref,switch_is(level)] */,
 				     WERROR *werror);
 NTSTATUS rpccli_srvsvc_NetSrvSetInfo(struct rpc_pipe_client *cli,
 				     TALLOC_CTX *mem_ctx,
-				     const char *server_unc,
-				     uint32_t level,
-				     union srvsvc_NetSrvInfo *info,
-				     uint32_t *parm_error,
+				     const char *server_unc /* [in] [unique,charset(UTF16)] */,
+				     uint32_t level /* [in]  */,
+				     union srvsvc_NetSrvInfo *info /* [in] [ref,switch_is(level)] */,
+				     uint32_t *parm_error /* [in,out] [unique] */,
 				     WERROR *werror);
 NTSTATUS rpccli_srvsvc_NetDiskEnum(struct rpc_pipe_client *cli,
 				   TALLOC_CTX *mem_ctx,
-				   const char *server_unc,
-				   uint32_t level,
-				   struct srvsvc_NetDiskInfo *info,
-				   uint32_t maxlen,
-				   uint32_t *totalentries,
-				   uint32_t *resume_handle,
+				   const char *server_unc /* [in] [unique,charset(UTF16)] */,
+				   uint32_t level /* [in]  */,
+				   struct srvsvc_NetDiskInfo *info /* [in,out] [ref] */,
+				   uint32_t maxlen /* [in]  */,
+				   uint32_t *totalentries /* [out] [ref] */,
+				   uint32_t *resume_handle /* [in,out] [unique] */,
 				   WERROR *werror);
 NTSTATUS rpccli_srvsvc_NetServerStatisticsGet(struct rpc_pipe_client *cli,
 					      TALLOC_CTX *mem_ctx,
-					      const char *server_unc,
-					      const char *service,
-					      uint32_t level,
-					      uint32_t options,
-					      struct srvsvc_Statistics *stats,
+					      const char *server_unc /* [in] [unique,charset(UTF16)] */,
+					      const char *service /* [in] [unique,charset(UTF16)] */,
+					      uint32_t level /* [in]  */,
+					      uint32_t options /* [in]  */,
+					      struct srvsvc_Statistics *stats /* [out] [ref] */,
 					      WERROR *werror);
 NTSTATUS rpccli_srvsvc_NetTransportAdd(struct rpc_pipe_client *cli,
 				       TALLOC_CTX *mem_ctx,
-				       const char *server_unc,
-				       uint32_t level,
-				       union srvsvc_NetTransportInfo info,
+				       const char *server_unc /* [in] [unique,charset(UTF16)] */,
+				       uint32_t level /* [in]  */,
+				       union srvsvc_NetTransportInfo info /* [in] [switch_is(level)] */,
 				       WERROR *werror);
 NTSTATUS rpccli_srvsvc_NetTransportEnum(struct rpc_pipe_client *cli,
 					TALLOC_CTX *mem_ctx,
-					const char *server_unc,
-					uint32_t *level,
-					union srvsvc_NetTransportCtr *transports,
-					uint32_t max_buffer,
-					uint32_t *totalentries,
-					uint32_t *resume_handle,
+					const char *server_unc /* [in] [unique,charset(UTF16)] */,
+					uint32_t *level /* [in,out] [ref] */,
+					union srvsvc_NetTransportCtr *transports /* [in,out] [ref,switch_is(*level)] */,
+					uint32_t max_buffer /* [in]  */,
+					uint32_t *totalentries /* [out] [ref] */,
+					uint32_t *resume_handle /* [in,out] [unique] */,
 					WERROR *werror);
 NTSTATUS rpccli_srvsvc_NetTransportDel(struct rpc_pipe_client *cli,
 				       TALLOC_CTX *mem_ctx,
-				       const char *server_unc,
-				       uint32_t unknown,
-				       struct srvsvc_NetTransportInfo0 transport,
+				       const char *server_unc /* [in] [unique,charset(UTF16)] */,
+				       uint32_t unknown /* [in]  */,
+				       struct srvsvc_NetTransportInfo0 transport /* [in]  */,
 				       WERROR *werror);
 NTSTATUS rpccli_srvsvc_NetRemoteTOD(struct rpc_pipe_client *cli,
 				    TALLOC_CTX *mem_ctx,
-				    const char *server_unc,
-				    struct srvsvc_NetRemoteTODInfo **info,
+				    const char *server_unc /* [in] [unique,charset(UTF16)] */,
+				    struct srvsvc_NetRemoteTODInfo **info /* [out] [ref] */,
 				    WERROR *werror);
 NTSTATUS rpccli_srvsvc_NetSetServiceBits(struct rpc_pipe_client *cli,
 					 TALLOC_CTX *mem_ctx,
-					 const char *server_unc,
-					 const char *transport,
-					 uint32_t servicebits,
-					 uint32_t updateimmediately,
+					 const char *server_unc /* [in] [unique,charset(UTF16)] */,
+					 const char *transport /* [in] [unique,charset(UTF16)] */,
+					 uint32_t servicebits /* [in]  */,
+					 uint32_t updateimmediately /* [in]  */,
 					 WERROR *werror);
 NTSTATUS rpccli_srvsvc_NetPathType(struct rpc_pipe_client *cli,
 				   TALLOC_CTX *mem_ctx,
-				   const char *server_unc,
-				   const char *path,
-				   uint32_t pathflags,
-				   uint32_t *pathtype,
+				   const char *server_unc /* [in] [unique,charset(UTF16)] */,
+				   const char *path /* [in] [charset(UTF16)] */,
+				   uint32_t pathflags /* [in]  */,
+				   uint32_t *pathtype /* [out] [ref] */,
 				   WERROR *werror);
 NTSTATUS rpccli_srvsvc_NetPathCanonicalize(struct rpc_pipe_client *cli,
 					   TALLOC_CTX *mem_ctx,
-					   const char *server_unc,
-					   const char *path,
-					   uint8_t *can_path,
-					   uint32_t maxbuf,
-					   const char *prefix,
-					   uint32_t *pathtype,
-					   uint32_t pathflags,
+					   const char *server_unc /* [in] [unique,charset(UTF16)] */,
+					   const char *path /* [in] [charset(UTF16)] */,
+					   uint8_t *can_path /* [out] [size_is(maxbuf)] */,
+					   uint32_t maxbuf /* [in]  */,
+					   const char *prefix /* [in] [charset(UTF16)] */,
+					   uint32_t *pathtype /* [in,out] [ref] */,
+					   uint32_t pathflags /* [in]  */,
 					   WERROR *werror);
 NTSTATUS rpccli_srvsvc_NetPathCompare(struct rpc_pipe_client *cli,
 				      TALLOC_CTX *mem_ctx,
-				      const char *server_unc,
-				      const char *path1,
-				      const char *path2,
-				      uint32_t pathtype,
-				      uint32_t pathflags,
+				      const char *server_unc /* [in] [unique,charset(UTF16)] */,
+				      const char *path1 /* [in] [charset(UTF16)] */,
+				      const char *path2 /* [in] [charset(UTF16)] */,
+				      uint32_t pathtype /* [in]  */,
+				      uint32_t pathflags /* [in]  */,
 				      WERROR *werror);
 NTSTATUS rpccli_srvsvc_NetNameValidate(struct rpc_pipe_client *cli,
 				       TALLOC_CTX *mem_ctx,
-				       const char *server_unc,
-				       const char *name,
-				       uint32_t name_type,
-				       uint32_t flags,
+				       const char *server_unc /* [in] [unique,charset(UTF16)] */,
+				       const char *name /* [in] [charset(UTF16)] */,
+				       uint32_t name_type /* [in]  */,
+				       uint32_t flags /* [in]  */,
 				       WERROR *werror);
 NTSTATUS rpccli_srvsvc_NETRPRNAMECANONICALIZE(struct rpc_pipe_client *cli,
 					      TALLOC_CTX *mem_ctx,
 					      WERROR *werror);
 NTSTATUS rpccli_srvsvc_NetPRNameCompare(struct rpc_pipe_client *cli,
 					TALLOC_CTX *mem_ctx,
-					const char *server_unc,
-					const char *name1,
-					const char *name2,
-					uint32_t name_type,
-					uint32_t flags,
+					const char *server_unc /* [in] [unique,charset(UTF16)] */,
+					const char *name1 /* [in] [charset(UTF16)] */,
+					const char *name2 /* [in] [charset(UTF16)] */,
+					uint32_t name_type /* [in]  */,
+					uint32_t flags /* [in]  */,
 					WERROR *werror);
 NTSTATUS rpccli_srvsvc_NetShareEnum(struct rpc_pipe_client *cli,
 				    TALLOC_CTX *mem_ctx,
-				    const char *server_unc,
-				    struct srvsvc_NetShareInfoCtr *info_ctr,
-				    uint32_t max_buffer,
-				    uint32_t *totalentries,
-				    uint32_t *resume_handle,
+				    const char *server_unc /* [in] [unique,charset(UTF16)] */,
+				    struct srvsvc_NetShareInfoCtr *info_ctr /* [in,out] [ref] */,
+				    uint32_t max_buffer /* [in]  */,
+				    uint32_t *totalentries /* [out] [ref] */,
+				    uint32_t *resume_handle /* [in,out] [unique] */,
 				    WERROR *werror);
 NTSTATUS rpccli_srvsvc_NetShareDelStart(struct rpc_pipe_client *cli,
 					TALLOC_CTX *mem_ctx,
-					const char *server_unc,
-					const char *share,
-					uint32_t reserved,
-					struct policy_handle *hnd,
+					const char *server_unc /* [in] [unique,charset(UTF16)] */,
+					const char *share /* [in] [charset(UTF16)] */,
+					uint32_t reserved /* [in]  */,
+					struct policy_handle *hnd /* [out] [unique] */,
 					WERROR *werror);
 NTSTATUS rpccli_srvsvc_NetShareDelCommit(struct rpc_pipe_client *cli,
 					 TALLOC_CTX *mem_ctx,
-					 struct policy_handle *hnd,
+					 struct policy_handle *hnd /* [in,out] [unique] */,
 					 WERROR *werror);
 NTSTATUS rpccli_srvsvc_NetGetFileSecurity(struct rpc_pipe_client *cli,
 					  TALLOC_CTX *mem_ctx,
-					  const char *server_unc,
-					  const char *share,
-					  const char *file,
-					  uint32_t securityinformation,
-					  struct sec_desc_buf **sd_buf,
+					  const char *server_unc /* [in] [unique,charset(UTF16)] */,
+					  const char *share /* [in] [unique,charset(UTF16)] */,
+					  const char *file /* [in] [charset(UTF16)] */,
+					  uint32_t securityinformation /* [in]  */,
+					  struct sec_desc_buf **sd_buf /* [out] [ref] */,
 					  WERROR *werror);
 NTSTATUS rpccli_srvsvc_NetSetFileSecurity(struct rpc_pipe_client *cli,
 					  TALLOC_CTX *mem_ctx,
-					  const char *server_unc,
-					  const char *share,
-					  const char *file,
-					  uint32_t securityinformation,
-					  struct sec_desc_buf *sd_buf,
+					  const char *server_unc /* [in] [unique,charset(UTF16)] */,
+					  const char *share /* [in] [unique,charset(UTF16)] */,
+					  const char *file /* [in] [charset(UTF16)] */,
+					  uint32_t securityinformation /* [in]  */,
+					  struct sec_desc_buf *sd_buf /* [in] [ref] */,
 					  WERROR *werror);
 NTSTATUS rpccli_srvsvc_NetServerTransportAddEx(struct rpc_pipe_client *cli,
 					       TALLOC_CTX *mem_ctx,
-					       const char *server_unc,
-					       uint32_t level,
-					       union srvsvc_NetTransportInfo info,
+					       const char *server_unc /* [in] [unique,charset(UTF16)] */,
+					       uint32_t level /* [in]  */,
+					       union srvsvc_NetTransportInfo info /* [in] [switch_is(level)] */,
 					       WERROR *werror);
 NTSTATUS rpccli_srvsvc_NetServerSetServiceBitsEx(struct rpc_pipe_client *cli,
 						 TALLOC_CTX *mem_ctx,
-						 const char *server_unc,
-						 const char *emulated_server_unc,
-						 const char *transport,
-						 uint32_t servicebitsofinterest,
-						 uint32_t servicebits,
-						 uint32_t updateimmediately,
+						 const char *server_unc /* [in] [unique,charset(UTF16)] */,
+						 const char *emulated_server_unc /* [in] [unique,charset(UTF16)] */,
+						 const char *transport /* [in] [unique,charset(UTF16)] */,
+						 uint32_t servicebitsofinterest /* [in]  */,
+						 uint32_t servicebits /* [in]  */,
+						 uint32_t updateimmediately /* [in]  */,
 						 WERROR *werror);
 NTSTATUS rpccli_srvsvc_NETRDFSGETVERSION(struct rpc_pipe_client *cli,
 					 TALLOC_CTX *mem_ctx,
diff --git a/source3/librpc/gen_ndr/cli_svcctl.c b/source3/librpc/gen_ndr/cli_svcctl.c
index 1d3bc57c49..93cef23b00 100644
--- a/source3/librpc/gen_ndr/cli_svcctl.c
+++ b/source3/librpc/gen_ndr/cli_svcctl.c
@@ -8,7 +8,7 @@
 
 NTSTATUS rpccli_svcctl_CloseServiceHandle(struct rpc_pipe_client *cli,
 					  TALLOC_CTX *mem_ctx,
-					  struct policy_handle *handle,
+					  struct policy_handle *handle /* [in,out] [ref] */,
 					  WERROR *werror)
 {
 	struct svcctl_CloseServiceHandle r;
@@ -53,9 +53,9 @@ NTSTATUS rpccli_svcctl_CloseServiceHandle(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_svcctl_ControlService(struct rpc_pipe_client *cli,
 				      TALLOC_CTX *mem_ctx,
-				      struct policy_handle *handle,
-				      uint32_t control,
-				      struct SERVICE_STATUS *service_status,
+				      struct policy_handle *handle /* [in] [ref] */,
+				      uint32_t control /* [in]  */,
+				      struct SERVICE_STATUS *service_status /* [out] [ref] */,
 				      WERROR *werror)
 {
 	struct svcctl_ControlService r;
@@ -101,7 +101,7 @@ NTSTATUS rpccli_svcctl_ControlService(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_svcctl_DeleteService(struct rpc_pipe_client *cli,
 				     TALLOC_CTX *mem_ctx,
-				     struct policy_handle *handle,
+				     struct policy_handle *handle /* [in] [ref] */,
 				     WERROR *werror)
 {
 	struct svcctl_DeleteService r;
@@ -145,8 +145,8 @@ NTSTATUS rpccli_svcctl_DeleteService(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_svcctl_LockServiceDatabase(struct rpc_pipe_client *cli,
 					   TALLOC_CTX *mem_ctx,
-					   struct policy_handle *handle,
-					   struct policy_handle *lock,
+					   struct policy_handle *handle /* [in] [ref] */,
+					   struct policy_handle *lock /* [out] [ref] */,
 					   WERROR *werror)
 {
 	struct svcctl_LockServiceDatabase r;
@@ -191,11 +191,11 @@ NTSTATUS rpccli_svcctl_LockServiceDatabase(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_svcctl_QueryServiceObjectSecurity(struct rpc_pipe_client *cli,
 						  TALLOC_CTX *mem_ctx,
-						  struct policy_handle *handle,
-						  uint32_t security_flags,
-						  uint8_t *buffer,
-						  uint32_t buffer_size,
-						  uint32_t *needed,
+						  struct policy_handle *handle /* [in] [ref] */,
+						  uint32_t security_flags /* [in]  */,
+						  uint8_t *buffer /* [out] [ref,size_is(buffer_size)] */,
+						  uint32_t buffer_size /* [in] [range(0,0x40000)] */,
+						  uint32_t *needed /* [out] [ref,range(0,0x40000)] */,
 						  WERROR *werror)
 {
 	struct svcctl_QueryServiceObjectSecurity r;
@@ -243,10 +243,10 @@ NTSTATUS rpccli_svcctl_QueryServiceObjectSecurity(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_svcctl_SetServiceObjectSecurity(struct rpc_pipe_client *cli,
 						TALLOC_CTX *mem_ctx,
-						struct policy_handle *handle,
-						uint32_t security_flags,
-						uint8_t *buffer,
-						uint32_t buffer_size,
+						struct policy_handle *handle /* [in] [ref] */,
+						uint32_t security_flags /* [in]  */,
+						uint8_t *buffer /* [in] [ref,size_is(buffer_size)] */,
+						uint32_t buffer_size /* [in]  */,
 						WERROR *werror)
 {
 	struct svcctl_SetServiceObjectSecurity r;
@@ -293,8 +293,8 @@ NTSTATUS rpccli_svcctl_SetServiceObjectSecurity(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_svcctl_QueryServiceStatus(struct rpc_pipe_client *cli,
 					  TALLOC_CTX *mem_ctx,
-					  struct policy_handle *handle,
-					  struct SERVICE_STATUS *service_status,
+					  struct policy_handle *handle /* [in] [ref] */,
+					  struct SERVICE_STATUS *service_status /* [out] [ref] */,
 					  WERROR *werror)
 {
 	struct svcctl_QueryServiceStatus r;
@@ -381,7 +381,7 @@ NTSTATUS rpccli_svcctl_SetServiceStatus(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_svcctl_UnlockServiceDatabase(struct rpc_pipe_client *cli,
 					     TALLOC_CTX *mem_ctx,
-					     struct policy_handle *lock,
+					     struct policy_handle *lock /* [in,out] [ref] */,
 					     WERROR *werror)
 {
 	struct svcctl_UnlockServiceDatabase r;
@@ -468,10 +468,10 @@ NTSTATUS rpccli_svcctl_NotifyBootConfigStatus(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_svcctl_SCSetServiceBitsW(struct rpc_pipe_client *cli,
 					 TALLOC_CTX *mem_ctx,
-					 struct policy_handle *handle,
-					 uint32_t bits,
-					 uint32_t bitson,
-					 uint32_t immediate,
+					 struct policy_handle *handle /* [in] [ref] */,
+					 uint32_t bits /* [in]  */,
+					 uint32_t bitson /* [in]  */,
+					 uint32_t immediate /* [in]  */,
 					 WERROR *werror)
 {
 	struct svcctl_SCSetServiceBitsW r;
@@ -518,17 +518,17 @@ NTSTATUS rpccli_svcctl_SCSetServiceBitsW(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_svcctl_ChangeServiceConfigW(struct rpc_pipe_client *cli,
 					    TALLOC_CTX *mem_ctx,
-					    struct policy_handle *handle,
-					    uint32_t type,
-					    uint32_t start,
-					    uint32_t error,
-					    const char *binary_path,
-					    const char *load_order_group,
-					    uint32_t *tag_id,
-					    const char *dependencies,
-					    const char *service_start_name,
-					    const char *password,
-					    const char *display_name,
+					    struct policy_handle *handle /* [in] [ref] */,
+					    uint32_t type /* [in]  */,
+					    uint32_t start /* [in]  */,
+					    uint32_t error /* [in]  */,
+					    const char *binary_path /* [in] [unique,charset(UTF16)] */,
+					    const char *load_order_group /* [in] [unique,charset(UTF16)] */,
+					    uint32_t *tag_id /* [out] [ref] */,
+					    const char *dependencies /* [in] [unique,charset(UTF16)] */,
+					    const char *service_start_name /* [in] [unique,charset(UTF16)] */,
+					    const char *password /* [in] [unique,charset(UTF16)] */,
+					    const char *display_name /* [in] [unique,charset(UTF16)] */,
 					    WERROR *werror)
 {
 	struct svcctl_ChangeServiceConfigW r;
@@ -582,22 +582,22 @@ NTSTATUS rpccli_svcctl_ChangeServiceConfigW(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_svcctl_CreateServiceW(struct rpc_pipe_client *cli,
 				      TALLOC_CTX *mem_ctx,
-				      struct policy_handle *scmanager_handle,
-				      const char *ServiceName,
-				      const char *DisplayName,
-				      uint32_t desired_access,
-				      uint32_t type,
-				      uint32_t start_type,
-				      uint32_t error_control,
-				      const char *binary_path,
-				      const char *LoadOrderGroupKey,
-				      uint32_t *TagId,
-				      uint8_t *dependencies,
-				      uint32_t dependencies_size,
-				      const char *service_start_name,
-				      uint8_t *password,
-				      uint32_t password_size,
-				      struct policy_handle *handle,
+				      struct policy_handle *scmanager_handle /* [in] [ref] */,
+				      const char *ServiceName /* [in] [charset(UTF16)] */,
+				      const char *DisplayName /* [in] [unique,charset(UTF16)] */,
+				      uint32_t desired_access /* [in]  */,
+				      uint32_t type /* [in]  */,
+				      uint32_t start_type /* [in]  */,
+				      uint32_t error_control /* [in]  */,
+				      const char *binary_path /* [in] [charset(UTF16)] */,
+				      const char *LoadOrderGroupKey /* [in] [unique,charset(UTF16)] */,
+				      uint32_t *TagId /* [in,out] [unique] */,
+				      uint8_t *dependencies /* [in] [unique,size_is(dependencies_size)] */,
+				      uint32_t dependencies_size /* [in]  */,
+				      const char *service_start_name /* [in] [unique,charset(UTF16)] */,
+				      uint8_t *password /* [in] [unique,size_is(password_size)] */,
+				      uint32_t password_size /* [in]  */,
+				      struct policy_handle *handle /* [out] [ref] */,
 				      WERROR *werror)
 {
 	struct svcctl_CreateServiceW r;
@@ -659,12 +659,12 @@ NTSTATUS rpccli_svcctl_CreateServiceW(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_svcctl_EnumDependentServicesW(struct rpc_pipe_client *cli,
 					      TALLOC_CTX *mem_ctx,
-					      struct policy_handle *service,
-					      uint32_t state,
-					      uint8_t *service_status,
-					      uint32_t buf_size,
-					      uint32_t *bytes_needed,
-					      uint32_t *services_returned,
+					      struct policy_handle *service /* [in] [ref] */,
+					      uint32_t state /* [in]  */,
+					      uint8_t *service_status /* [out] [ref,size_is(buf_size)] */,
+					      uint32_t buf_size /* [in] [range(0,0x40000)] */,
+					      uint32_t *bytes_needed /* [out] [ref,range(0,0x40000)] */,
+					      uint32_t *services_returned /* [out] [ref,range(0,0x40000)] */,
 					      WERROR *werror)
 {
 	struct svcctl_EnumDependentServicesW r;
@@ -713,14 +713,14 @@ NTSTATUS rpccli_svcctl_EnumDependentServicesW(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_svcctl_EnumServicesStatusW(struct rpc_pipe_client *cli,
 					   TALLOC_CTX *mem_ctx,
-					   struct policy_handle *handle,
-					   uint32_t type,
-					   uint32_t state,
-					   uint32_t buf_size,
-					   uint8_t *service,
-					   uint32_t *bytes_needed,
-					   uint32_t *services_returned,
-					   uint32_t *resume_handle,
+					   struct policy_handle *handle /* [in] [ref] */,
+					   uint32_t type /* [in]  */,
+					   uint32_t state /* [in]  */,
+					   uint32_t buf_size /* [in]  */,
+					   uint8_t *service /* [out] [size_is(buf_size)] */,
+					   uint32_t *bytes_needed /* [out] [ref] */,
+					   uint32_t *services_returned /* [out] [ref] */,
+					   uint32_t *resume_handle /* [in,out] [unique] */,
 					   WERROR *werror)
 {
 	struct svcctl_EnumServicesStatusW r;
@@ -774,10 +774,10 @@ NTSTATUS rpccli_svcctl_EnumServicesStatusW(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_svcctl_OpenSCManagerW(struct rpc_pipe_client *cli,
 				      TALLOC_CTX *mem_ctx,
-				      const char *MachineName,
-				      const char *DatabaseName,
-				      uint32_t access_mask,
-				      struct policy_handle *handle,
+				      const char *MachineName /* [in] [unique,charset(UTF16)] */,
+				      const char *DatabaseName /* [in] [unique,charset(UTF16)] */,
+				      uint32_t access_mask /* [in]  */,
+				      struct policy_handle *handle /* [out] [ref] */,
 				      WERROR *werror)
 {
 	struct svcctl_OpenSCManagerW r;
@@ -824,10 +824,10 @@ NTSTATUS rpccli_svcctl_OpenSCManagerW(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_svcctl_OpenServiceW(struct rpc_pipe_client *cli,
 				    TALLOC_CTX *mem_ctx,
-				    struct policy_handle *scmanager_handle,
-				    const char *ServiceName,
-				    uint32_t access_mask,
-				    struct policy_handle *handle,
+				    struct policy_handle *scmanager_handle /* [in] [ref] */,
+				    const char *ServiceName /* [in] [charset(UTF16)] */,
+				    uint32_t access_mask /* [in]  */,
+				    struct policy_handle *handle /* [out] [ref] */,
 				    WERROR *werror)
 {
 	struct svcctl_OpenServiceW r;
@@ -874,10 +874,10 @@ NTSTATUS rpccli_svcctl_OpenServiceW(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_svcctl_QueryServiceConfigW(struct rpc_pipe_client *cli,
 					   TALLOC_CTX *mem_ctx,
-					   struct policy_handle *handle,
-					   uint8_t *query,
-					   uint32_t buf_size,
-					   uint32_t *bytes_needed,
+					   struct policy_handle *handle /* [in] [ref] */,
+					   uint8_t *query /* [out]  */,
+					   uint32_t buf_size /* [in]  */,
+					   uint32_t *bytes_needed /* [out] [ref] */,
 					   WERROR *werror)
 {
 	struct svcctl_QueryServiceConfigW r;
@@ -924,10 +924,10 @@ NTSTATUS rpccli_svcctl_QueryServiceConfigW(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_svcctl_QueryServiceLockStatusW(struct rpc_pipe_client *cli,
 					       TALLOC_CTX *mem_ctx,
-					       struct policy_handle *handle,
-					       uint32_t buf_size,
-					       struct SERVICE_LOCK_STATUS *lock_status,
-					       uint32_t *required_buf_size,
+					       struct policy_handle *handle /* [in] [ref] */,
+					       uint32_t buf_size /* [in]  */,
+					       struct SERVICE_LOCK_STATUS *lock_status /* [out] [ref] */,
+					       uint32_t *required_buf_size /* [out] [ref] */,
 					       WERROR *werror)
 {
 	struct svcctl_QueryServiceLockStatusW r;
@@ -974,9 +974,9 @@ NTSTATUS rpccli_svcctl_QueryServiceLockStatusW(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_svcctl_StartServiceW(struct rpc_pipe_client *cli,
 				     TALLOC_CTX *mem_ctx,
-				     struct policy_handle *handle,
-				     uint32_t NumArgs,
-				     const char *Arguments,
+				     struct policy_handle *handle /* [in] [ref] */,
+				     uint32_t NumArgs /* [in]  */,
+				     const char *Arguments /* [in] [unique,charset(UTF16)] */,
 				     WERROR *werror)
 {
 	struct svcctl_StartServiceW r;
@@ -1022,10 +1022,10 @@ NTSTATUS rpccli_svcctl_StartServiceW(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_svcctl_GetServiceDisplayNameW(struct rpc_pipe_client *cli,
 					      TALLOC_CTX *mem_ctx,
-					      struct policy_handle *handle,
-					      const char *service_name,
-					      const char **display_name,
-					      uint32_t *display_name_length,
+					      struct policy_handle *handle /* [in] [ref] */,
+					      const char *service_name /* [in] [unique,charset(UTF16)] */,
+					      const char **display_name /* [out] [ref,charset(UTF16)] */,
+					      uint32_t *display_name_length /* [in,out] [unique] */,
 					      WERROR *werror)
 {
 	struct svcctl_GetServiceDisplayNameW r;
@@ -1075,10 +1075,10 @@ NTSTATUS rpccli_svcctl_GetServiceDisplayNameW(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_svcctl_GetServiceKeyNameW(struct rpc_pipe_client *cli,
 					  TALLOC_CTX *mem_ctx,
-					  struct policy_handle *handle,
-					  const char *service_name,
-					  const char **key_name,
-					  uint32_t *display_name_length,
+					  struct policy_handle *handle /* [in] [ref] */,
+					  const char *service_name /* [in] [unique,charset(UTF16)] */,
+					  const char **key_name /* [out] [ref,charset(UTF16)] */,
+					  uint32_t *display_name_length /* [in,out] [unique] */,
 					  WERROR *werror)
 {
 	struct svcctl_GetServiceKeyNameW r;
@@ -1128,10 +1128,10 @@ NTSTATUS rpccli_svcctl_GetServiceKeyNameW(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_svcctl_SCSetServiceBitsA(struct rpc_pipe_client *cli,
 					 TALLOC_CTX *mem_ctx,
-					 struct policy_handle *handle,
-					 uint32_t bits,
-					 uint32_t bitson,
-					 uint32_t immediate,
+					 struct policy_handle *handle /* [in] [ref] */,
+					 uint32_t bits /* [in]  */,
+					 uint32_t bitson /* [in]  */,
+					 uint32_t immediate /* [in]  */,
 					 WERROR *werror)
 {
 	struct svcctl_SCSetServiceBitsA r;
@@ -1178,17 +1178,17 @@ NTSTATUS rpccli_svcctl_SCSetServiceBitsA(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_svcctl_ChangeServiceConfigA(struct rpc_pipe_client *cli,
 					    TALLOC_CTX *mem_ctx,
-					    struct policy_handle *handle,
-					    uint32_t type,
-					    uint32_t start,
-					    uint32_t error,
-					    const char *binary_path,
-					    const char *load_order_group,
-					    uint32_t *tag_id,
-					    const char *dependencies,
-					    const char *service_start_name,
-					    const char *password,
-					    const char *display_name,
+					    struct policy_handle *handle /* [in] [ref] */,
+					    uint32_t type /* [in]  */,
+					    uint32_t start /* [in]  */,
+					    uint32_t error /* [in]  */,
+					    const char *binary_path /* [in] [unique,charset(UTF16)] */,
+					    const char *load_order_group /* [in] [unique,charset(UTF16)] */,
+					    uint32_t *tag_id /* [out] [ref] */,
+					    const char *dependencies /* [in] [unique,charset(UTF16)] */,
+					    const char *service_start_name /* [in] [unique,charset(UTF16)] */,
+					    const char *password /* [in] [unique,charset(UTF16)] */,
+					    const char *display_name /* [in] [unique,charset(UTF16)] */,
 					    WERROR *werror)
 {
 	struct svcctl_ChangeServiceConfigA r;
@@ -1242,19 +1242,19 @@ NTSTATUS rpccli_svcctl_ChangeServiceConfigA(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_svcctl_CreateServiceA(struct rpc_pipe_client *cli,
 				      TALLOC_CTX *mem_ctx,
-				      struct policy_handle *handle,
-				      const char *ServiceName,
-				      const char *DisplayName,
-				      uint32_t desired_access,
-				      uint32_t type,
-				      uint32_t start_type,
-				      uint32_t error_control,
-				      const char *binary_path,
-				      const char *LoadOrderGroupKey,
-				      uint32_t *TagId,
-				      const char *dependencies,
-				      const char *service_start_name,
-				      const char *password,
+				      struct policy_handle *handle /* [in] [ref] */,
+				      const char *ServiceName /* [in] [unique,charset(UTF16)] */,
+				      const char *DisplayName /* [in] [unique,charset(UTF16)] */,
+				      uint32_t desired_access /* [in]  */,
+				      uint32_t type /* [in]  */,
+				      uint32_t start_type /* [in]  */,
+				      uint32_t error_control /* [in]  */,
+				      const char *binary_path /* [in] [unique,charset(UTF16)] */,
+				      const char *LoadOrderGroupKey /* [in] [unique,charset(UTF16)] */,
+				      uint32_t *TagId /* [out] [unique] */,
+				      const char *dependencies /* [in] [unique,charset(UTF16)] */,
+				      const char *service_start_name /* [in] [unique,charset(UTF16)] */,
+				      const char *password /* [in] [unique,charset(UTF16)] */,
 				      WERROR *werror)
 {
 	struct svcctl_CreateServiceA r;
@@ -1312,12 +1312,12 @@ NTSTATUS rpccli_svcctl_CreateServiceA(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_svcctl_EnumDependentServicesA(struct rpc_pipe_client *cli,
 					      TALLOC_CTX *mem_ctx,
-					      struct policy_handle *service,
-					      uint32_t state,
-					      struct ENUM_SERVICE_STATUS *service_status,
-					      uint32_t buf_size,
-					      uint32_t *bytes_needed,
-					      uint32_t *services_returned,
+					      struct policy_handle *service /* [in] [ref] */,
+					      uint32_t state /* [in]  */,
+					      struct ENUM_SERVICE_STATUS *service_status /* [out] [unique] */,
+					      uint32_t buf_size /* [in]  */,
+					      uint32_t *bytes_needed /* [out] [ref] */,
+					      uint32_t *services_returned /* [out] [ref] */,
 					      WERROR *werror)
 {
 	struct svcctl_EnumDependentServicesA r;
@@ -1368,14 +1368,14 @@ NTSTATUS rpccli_svcctl_EnumDependentServicesA(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_svcctl_EnumServicesStatusA(struct rpc_pipe_client *cli,
 					   TALLOC_CTX *mem_ctx,
-					   struct policy_handle *handle,
-					   uint32_t type,
-					   uint32_t state,
-					   uint32_t buf_size,
-					   uint8_t *service,
-					   uint32_t *bytes_needed,
-					   uint32_t *services_returned,
-					   uint32_t *resume_handle,
+					   struct policy_handle *handle /* [in] [ref] */,
+					   uint32_t type /* [in]  */,
+					   uint32_t state /* [in]  */,
+					   uint32_t buf_size /* [in]  */,
+					   uint8_t *service /* [out] [size_is(buf_size)] */,
+					   uint32_t *bytes_needed /* [out] [ref] */,
+					   uint32_t *services_returned /* [out] [ref] */,
+					   uint32_t *resume_handle /* [in,out] [unique] */,
 					   WERROR *werror)
 {
 	struct svcctl_EnumServicesStatusA r;
@@ -1429,10 +1429,10 @@ NTSTATUS rpccli_svcctl_EnumServicesStatusA(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_svcctl_OpenSCManagerA(struct rpc_pipe_client *cli,
 				      TALLOC_CTX *mem_ctx,
-				      const char *MachineName,
-				      const char *DatabaseName,
-				      uint32_t access_mask,
-				      struct policy_handle *handle,
+				      const char *MachineName /* [in] [unique,charset(UTF16)] */,
+				      const char *DatabaseName /* [in] [unique,charset(UTF16)] */,
+				      uint32_t access_mask /* [in]  */,
+				      struct policy_handle *handle /* [out] [ref] */,
 				      WERROR *werror)
 {
 	struct svcctl_OpenSCManagerA r;
@@ -1479,9 +1479,9 @@ NTSTATUS rpccli_svcctl_OpenSCManagerA(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_svcctl_OpenServiceA(struct rpc_pipe_client *cli,
 				    TALLOC_CTX *mem_ctx,
-				    struct policy_handle *scmanager_handle,
-				    const char *ServiceName,
-				    uint32_t access_mask,
+				    struct policy_handle *scmanager_handle /* [in] [ref] */,
+				    const char *ServiceName /* [in] [unique,charset(UTF16)] */,
+				    uint32_t access_mask /* [in]  */,
 				    WERROR *werror)
 {
 	struct svcctl_OpenServiceA r;
@@ -1527,10 +1527,10 @@ NTSTATUS rpccli_svcctl_OpenServiceA(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_svcctl_QueryServiceConfigA(struct rpc_pipe_client *cli,
 					   TALLOC_CTX *mem_ctx,
-					   struct policy_handle *handle,
-					   uint8_t *query,
-					   uint32_t buf_size,
-					   uint32_t *bytes_needed,
+					   struct policy_handle *handle /* [in] [ref] */,
+					   uint8_t *query /* [out]  */,
+					   uint32_t buf_size /* [in]  */,
+					   uint32_t *bytes_needed /* [out] [ref] */,
 					   WERROR *werror)
 {
 	struct svcctl_QueryServiceConfigA r;
@@ -1577,10 +1577,10 @@ NTSTATUS rpccli_svcctl_QueryServiceConfigA(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_svcctl_QueryServiceLockStatusA(struct rpc_pipe_client *cli,
 					       TALLOC_CTX *mem_ctx,
-					       struct policy_handle *handle,
-					       uint32_t buf_size,
-					       struct SERVICE_LOCK_STATUS *lock_status,
-					       uint32_t *required_buf_size,
+					       struct policy_handle *handle /* [in] [ref] */,
+					       uint32_t buf_size /* [in]  */,
+					       struct SERVICE_LOCK_STATUS *lock_status /* [out] [ref] */,
+					       uint32_t *required_buf_size /* [out] [ref] */,
 					       WERROR *werror)
 {
 	struct svcctl_QueryServiceLockStatusA r;
@@ -1627,9 +1627,9 @@ NTSTATUS rpccli_svcctl_QueryServiceLockStatusA(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_svcctl_StartServiceA(struct rpc_pipe_client *cli,
 				     TALLOC_CTX *mem_ctx,
-				     struct policy_handle *handle,
-				     uint32_t NumArgs,
-				     const char *Arguments,
+				     struct policy_handle *handle /* [in] [ref] */,
+				     uint32_t NumArgs /* [in]  */,
+				     const char *Arguments /* [in] [unique,charset(UTF16)] */,
 				     WERROR *werror)
 {
 	struct svcctl_StartServiceA r;
@@ -1675,10 +1675,10 @@ NTSTATUS rpccli_svcctl_StartServiceA(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_svcctl_GetServiceDisplayNameA(struct rpc_pipe_client *cli,
 					      TALLOC_CTX *mem_ctx,
-					      struct policy_handle *handle,
-					      const char *service_name,
-					      const char **display_name,
-					      uint32_t *display_name_length,
+					      struct policy_handle *handle /* [in] [ref] */,
+					      const char *service_name /* [in] [unique,charset(UTF16)] */,
+					      const char **display_name /* [out] [ref,charset(UTF16)] */,
+					      uint32_t *display_name_length /* [in,out] [unique] */,
 					      WERROR *werror)
 {
 	struct svcctl_GetServiceDisplayNameA r;
@@ -1728,10 +1728,10 @@ NTSTATUS rpccli_svcctl_GetServiceDisplayNameA(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_svcctl_GetServiceKeyNameA(struct rpc_pipe_client *cli,
 					  TALLOC_CTX *mem_ctx,
-					  struct policy_handle *handle,
-					  const char *service_name,
-					  const char **key_name,
-					  uint32_t *display_name_length,
+					  struct policy_handle *handle /* [in] [ref] */,
+					  const char *service_name /* [in] [unique,charset(UTF16)] */,
+					  const char **key_name /* [out] [ref,charset(UTF16)] */,
+					  uint32_t *display_name_length /* [in,out] [unique] */,
 					  WERROR *werror)
 {
 	struct svcctl_GetServiceKeyNameA r;
@@ -1865,9 +1865,9 @@ NTSTATUS rpccli_svcctl_EnumServiceGroupW(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_svcctl_ChangeServiceConfig2A(struct rpc_pipe_client *cli,
 					     TALLOC_CTX *mem_ctx,
-					     struct policy_handle *handle,
-					     uint32_t info_level,
-					     uint8_t *info,
+					     struct policy_handle *handle /* [in] [ref] */,
+					     uint32_t info_level /* [in]  */,
+					     uint8_t *info /* [in] [unique] */,
 					     WERROR *werror)
 {
 	struct svcctl_ChangeServiceConfig2A r;
@@ -1913,9 +1913,9 @@ NTSTATUS rpccli_svcctl_ChangeServiceConfig2A(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_svcctl_ChangeServiceConfig2W(struct rpc_pipe_client *cli,
 					     TALLOC_CTX *mem_ctx,
-					     struct policy_handle *handle,
-					     uint32_t info_level,
-					     uint8_t *info,
+					     struct policy_handle *handle /* [in] [ref] */,
+					     uint32_t info_level /* [in]  */,
+					     uint8_t *info /* [in] [unique] */,
 					     WERROR *werror)
 {
 	struct svcctl_ChangeServiceConfig2W r;
@@ -1961,11 +1961,11 @@ NTSTATUS rpccli_svcctl_ChangeServiceConfig2W(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_svcctl_QueryServiceConfig2A(struct rpc_pipe_client *cli,
 					    TALLOC_CTX *mem_ctx,
-					    struct policy_handle *handle,
-					    uint32_t info_level,
-					    uint8_t *buffer,
-					    uint32_t buf_size,
-					    uint32_t *bytes_needed,
+					    struct policy_handle *handle /* [in] [ref] */,
+					    uint32_t info_level /* [in]  */,
+					    uint8_t *buffer /* [out]  */,
+					    uint32_t buf_size /* [in]  */,
+					    uint32_t *bytes_needed /* [out] [ref] */,
 					    WERROR *werror)
 {
 	struct svcctl_QueryServiceConfig2A r;
@@ -2013,11 +2013,11 @@ NTSTATUS rpccli_svcctl_QueryServiceConfig2A(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_svcctl_QueryServiceConfig2W(struct rpc_pipe_client *cli,
 					    TALLOC_CTX *mem_ctx,
-					    struct policy_handle *handle,
-					    uint32_t info_level,
-					    uint8_t *buffer,
-					    uint32_t buf_size,
-					    uint32_t *bytes_needed,
+					    struct policy_handle *handle /* [in] [ref] */,
+					    uint32_t info_level /* [in]  */,
+					    uint8_t *buffer /* [out]  */,
+					    uint32_t buf_size /* [in]  */,
+					    uint32_t *bytes_needed /* [out] [ref] */,
 					    WERROR *werror)
 {
 	struct svcctl_QueryServiceConfig2W r;
@@ -2065,11 +2065,11 @@ NTSTATUS rpccli_svcctl_QueryServiceConfig2W(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_svcctl_QueryServiceStatusEx(struct rpc_pipe_client *cli,
 					    TALLOC_CTX *mem_ctx,
-					    struct policy_handle *handle,
-					    uint32_t info_level,
-					    uint8_t *buffer,
-					    uint32_t buf_size,
-					    uint32_t *bytes_needed,
+					    struct policy_handle *handle /* [in] [ref] */,
+					    uint32_t info_level /* [in]  */,
+					    uint8_t *buffer /* [out]  */,
+					    uint32_t buf_size /* [in]  */,
+					    uint32_t *bytes_needed /* [out] [ref] */,
 					    WERROR *werror)
 {
 	struct svcctl_QueryServiceStatusEx r;
@@ -2117,16 +2117,16 @@ NTSTATUS rpccli_svcctl_QueryServiceStatusEx(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_EnumServicesStatusExA(struct rpc_pipe_client *cli,
 				      TALLOC_CTX *mem_ctx,
-				      struct policy_handle *scmanager,
-				      uint32_t info_level,
-				      uint32_t type,
-				      uint32_t state,
-				      uint8_t *services,
-				      uint32_t buf_size,
-				      uint32_t *bytes_needed,
-				      uint32_t *service_returned,
-				      uint32_t *resume_handle,
-				      const char **group_name,
+				      struct policy_handle *scmanager /* [in] [ref] */,
+				      uint32_t info_level /* [in]  */,
+				      uint32_t type /* [in]  */,
+				      uint32_t state /* [in]  */,
+				      uint8_t *services /* [out]  */,
+				      uint32_t buf_size /* [in]  */,
+				      uint32_t *bytes_needed /* [out] [ref] */,
+				      uint32_t *service_returned /* [out] [ref] */,
+				      uint32_t *resume_handle /* [in,out] [unique] */,
+				      const char **group_name /* [out] [ref,charset(UTF16)] */,
 				      WERROR *werror)
 {
 	struct EnumServicesStatusExA r;
@@ -2182,16 +2182,16 @@ NTSTATUS rpccli_EnumServicesStatusExA(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_EnumServicesStatusExW(struct rpc_pipe_client *cli,
 				      TALLOC_CTX *mem_ctx,
-				      struct policy_handle *scmanager,
-				      uint32_t info_level,
-				      uint32_t type,
-				      uint32_t state,
-				      uint8_t *services,
-				      uint32_t buf_size,
-				      uint32_t *bytes_needed,
-				      uint32_t *service_returned,
-				      uint32_t *resume_handle,
-				      const char **group_name,
+				      struct policy_handle *scmanager /* [in] [ref] */,
+				      uint32_t info_level /* [in]  */,
+				      uint32_t type /* [in]  */,
+				      uint32_t state /* [in]  */,
+				      uint8_t *services /* [out]  */,
+				      uint32_t buf_size /* [in]  */,
+				      uint32_t *bytes_needed /* [out] [ref] */,
+				      uint32_t *service_returned /* [out] [ref] */,
+				      uint32_t *resume_handle /* [in,out] [unique] */,
+				      const char **group_name /* [out] [ref,charset(UTF16)] */,
 				      WERROR *werror)
 {
 	struct EnumServicesStatusExW r;
diff --git a/source3/librpc/gen_ndr/cli_svcctl.h b/source3/librpc/gen_ndr/cli_svcctl.h
index 5f724ed09e..56f0a2b0e7 100644
--- a/source3/librpc/gen_ndr/cli_svcctl.h
+++ b/source3/librpc/gen_ndr/cli_svcctl.h
@@ -3,264 +3,264 @@
 #define __CLI_SVCCTL__
 NTSTATUS rpccli_svcctl_CloseServiceHandle(struct rpc_pipe_client *cli,
 					  TALLOC_CTX *mem_ctx,
-					  struct policy_handle *handle,
+					  struct policy_handle *handle /* [in,out] [ref] */,
 					  WERROR *werror);
 NTSTATUS rpccli_svcctl_ControlService(struct rpc_pipe_client *cli,
 				      TALLOC_CTX *mem_ctx,
-				      struct policy_handle *handle,
-				      uint32_t control,
-				      struct SERVICE_STATUS *service_status,
+				      struct policy_handle *handle /* [in] [ref] */,
+				      uint32_t control /* [in]  */,
+				      struct SERVICE_STATUS *service_status /* [out] [ref] */,
 				      WERROR *werror);
 NTSTATUS rpccli_svcctl_DeleteService(struct rpc_pipe_client *cli,
 				     TALLOC_CTX *mem_ctx,
-				     struct policy_handle *handle,
+				     struct policy_handle *handle /* [in] [ref] */,
 				     WERROR *werror);
 NTSTATUS rpccli_svcctl_LockServiceDatabase(struct rpc_pipe_client *cli,
 					   TALLOC_CTX *mem_ctx,
-					   struct policy_handle *handle,
-					   struct policy_handle *lock,
+					   struct policy_handle *handle /* [in] [ref] */,
+					   struct policy_handle *lock /* [out] [ref] */,
 					   WERROR *werror);
 NTSTATUS rpccli_svcctl_QueryServiceObjectSecurity(struct rpc_pipe_client *cli,
 						  TALLOC_CTX *mem_ctx,
-						  struct policy_handle *handle,
-						  uint32_t security_flags,
-						  uint8_t *buffer,
-						  uint32_t buffer_size,
-						  uint32_t *needed,
+						  struct policy_handle *handle /* [in] [ref] */,
+						  uint32_t security_flags /* [in]  */,
+						  uint8_t *buffer /* [out] [ref,size_is(buffer_size)] */,
+						  uint32_t buffer_size /* [in] [range(0,0x40000)] */,
+						  uint32_t *needed /* [out] [ref,range(0,0x40000)] */,
 						  WERROR *werror);
 NTSTATUS rpccli_svcctl_SetServiceObjectSecurity(struct rpc_pipe_client *cli,
 						TALLOC_CTX *mem_ctx,
-						struct policy_handle *handle,
-						uint32_t security_flags,
-						uint8_t *buffer,
-						uint32_t buffer_size,
+						struct policy_handle *handle /* [in] [ref] */,
+						uint32_t security_flags /* [in]  */,
+						uint8_t *buffer /* [in] [ref,size_is(buffer_size)] */,
+						uint32_t buffer_size /* [in]  */,
 						WERROR *werror);
 NTSTATUS rpccli_svcctl_QueryServiceStatus(struct rpc_pipe_client *cli,
 					  TALLOC_CTX *mem_ctx,
-					  struct policy_handle *handle,
-					  struct SERVICE_STATUS *service_status,
+					  struct policy_handle *handle /* [in] [ref] */,
+					  struct SERVICE_STATUS *service_status /* [out] [ref] */,
 					  WERROR *werror);
 NTSTATUS rpccli_svcctl_SetServiceStatus(struct rpc_pipe_client *cli,
 					TALLOC_CTX *mem_ctx,
 					WERROR *werror);
 NTSTATUS rpccli_svcctl_UnlockServiceDatabase(struct rpc_pipe_client *cli,
 					     TALLOC_CTX *mem_ctx,
-					     struct policy_handle *lock,
+					     struct policy_handle *lock /* [in,out] [ref] */,
 					     WERROR *werror);
 NTSTATUS rpccli_svcctl_NotifyBootConfigStatus(struct rpc_pipe_client *cli,
 					      TALLOC_CTX *mem_ctx,
 					      WERROR *werror);
 NTSTATUS rpccli_svcctl_SCSetServiceBitsW(struct rpc_pipe_client *cli,
 					 TALLOC_CTX *mem_ctx,
-					 struct policy_handle *handle,
-					 uint32_t bits,
-					 uint32_t bitson,
-					 uint32_t immediate,
+					 struct policy_handle *handle /* [in] [ref] */,
+					 uint32_t bits /* [in]  */,
+					 uint32_t bitson /* [in]  */,
+					 uint32_t immediate /* [in]  */,
 					 WERROR *werror);
 NTSTATUS rpccli_svcctl_ChangeServiceConfigW(struct rpc_pipe_client *cli,
 					    TALLOC_CTX *mem_ctx,
-					    struct policy_handle *handle,
-					    uint32_t type,
-					    uint32_t start,
-					    uint32_t error,
-					    const char *binary_path,
-					    const char *load_order_group,
-					    uint32_t *tag_id,
-					    const char *dependencies,
-					    const char *service_start_name,
-					    const char *password,
-					    const char *display_name,
+					    struct policy_handle *handle /* [in] [ref] */,
+					    uint32_t type /* [in]  */,
+					    uint32_t start /* [in]  */,
+					    uint32_t error /* [in]  */,
+					    const char *binary_path /* [in] [unique,charset(UTF16)] */,
+					    const char *load_order_group /* [in] [unique,charset(UTF16)] */,
+					    uint32_t *tag_id /* [out] [ref] */,
+					    const char *dependencies /* [in] [unique,charset(UTF16)] */,
+					    const char *service_start_name /* [in] [unique,charset(UTF16)] */,
+					    const char *password /* [in] [unique,charset(UTF16)] */,
+					    const char *display_name /* [in] [unique,charset(UTF16)] */,
 					    WERROR *werror);
 NTSTATUS rpccli_svcctl_CreateServiceW(struct rpc_pipe_client *cli,
 				      TALLOC_CTX *mem_ctx,
-				      struct policy_handle *scmanager_handle,
-				      const char *ServiceName,
-				      const char *DisplayName,
-				      uint32_t desired_access,
-				      uint32_t type,
-				      uint32_t start_type,
-				      uint32_t error_control,
-				      const char *binary_path,
-				      const char *LoadOrderGroupKey,
-				      uint32_t *TagId,
-				      uint8_t *dependencies,
-				      uint32_t dependencies_size,
-				      const char *service_start_name,
-				      uint8_t *password,
-				      uint32_t password_size,
-				      struct policy_handle *handle,
+				      struct policy_handle *scmanager_handle /* [in] [ref] */,
+				      const char *ServiceName /* [in] [charset(UTF16)] */,
+				      const char *DisplayName /* [in] [unique,charset(UTF16)] */,
+				      uint32_t desired_access /* [in]  */,
+				      uint32_t type /* [in]  */,
+				      uint32_t start_type /* [in]  */,
+				      uint32_t error_control /* [in]  */,
+				      const char *binary_path /* [in] [charset(UTF16)] */,
+				      const char *LoadOrderGroupKey /* [in] [unique,charset(UTF16)] */,
+				      uint32_t *TagId /* [in,out] [unique] */,
+				      uint8_t *dependencies /* [in] [unique,size_is(dependencies_size)] */,
+				      uint32_t dependencies_size /* [in]  */,
+				      const char *service_start_name /* [in] [unique,charset(UTF16)] */,
+				      uint8_t *password /* [in] [unique,size_is(password_size)] */,
+				      uint32_t password_size /* [in]  */,
+				      struct policy_handle *handle /* [out] [ref] */,
 				      WERROR *werror);
 NTSTATUS rpccli_svcctl_EnumDependentServicesW(struct rpc_pipe_client *cli,
 					      TALLOC_CTX *mem_ctx,
-					      struct policy_handle *service,
-					      uint32_t state,
-					      uint8_t *service_status,
-					      uint32_t buf_size,
-					      uint32_t *bytes_needed,
-					      uint32_t *services_returned,
+					      struct policy_handle *service /* [in] [ref] */,
+					      uint32_t state /* [in]  */,
+					      uint8_t *service_status /* [out] [ref,size_is(buf_size)] */,
+					      uint32_t buf_size /* [in] [range(0,0x40000)] */,
+					      uint32_t *bytes_needed /* [out] [ref,range(0,0x40000)] */,
+					      uint32_t *services_returned /* [out] [ref,range(0,0x40000)] */,
 					      WERROR *werror);
 NTSTATUS rpccli_svcctl_EnumServicesStatusW(struct rpc_pipe_client *cli,
 					   TALLOC_CTX *mem_ctx,
-					   struct policy_handle *handle,
-					   uint32_t type,
-					   uint32_t state,
-					   uint32_t buf_size,
-					   uint8_t *service,
-					   uint32_t *bytes_needed,
-					   uint32_t *services_returned,
-					   uint32_t *resume_handle,
+					   struct policy_handle *handle /* [in] [ref] */,
+					   uint32_t type /* [in]  */,
+					   uint32_t state /* [in]  */,
+					   uint32_t buf_size /* [in]  */,
+					   uint8_t *service /* [out] [size_is(buf_size)] */,
+					   uint32_t *bytes_needed /* [out] [ref] */,
+					   uint32_t *services_returned /* [out] [ref] */,
+					   uint32_t *resume_handle /* [in,out] [unique] */,
 					   WERROR *werror);
 NTSTATUS rpccli_svcctl_OpenSCManagerW(struct rpc_pipe_client *cli,
 				      TALLOC_CTX *mem_ctx,
-				      const char *MachineName,
-				      const char *DatabaseName,
-				      uint32_t access_mask,
-				      struct policy_handle *handle,
+				      const char *MachineName /* [in] [unique,charset(UTF16)] */,
+				      const char *DatabaseName /* [in] [unique,charset(UTF16)] */,
+				      uint32_t access_mask /* [in]  */,
+				      struct policy_handle *handle /* [out] [ref] */,
 				      WERROR *werror);
 NTSTATUS rpccli_svcctl_OpenServiceW(struct rpc_pipe_client *cli,
 				    TALLOC_CTX *mem_ctx,
-				    struct policy_handle *scmanager_handle,
-				    const char *ServiceName,
-				    uint32_t access_mask,
-				    struct policy_handle *handle,
+				    struct policy_handle *scmanager_handle /* [in] [ref] */,
+				    const char *ServiceName /* [in] [charset(UTF16)] */,
+				    uint32_t access_mask /* [in]  */,
+				    struct policy_handle *handle /* [out] [ref] */,
 				    WERROR *werror);
 NTSTATUS rpccli_svcctl_QueryServiceConfigW(struct rpc_pipe_client *cli,
 					   TALLOC_CTX *mem_ctx,
-					   struct policy_handle *handle,
-					   uint8_t *query,
-					   uint32_t buf_size,
-					   uint32_t *bytes_needed,
+					   struct policy_handle *handle /* [in] [ref] */,
+					   uint8_t *query /* [out]  */,
+					   uint32_t buf_size /* [in]  */,
+					   uint32_t *bytes_needed /* [out] [ref] */,
 					   WERROR *werror);
 NTSTATUS rpccli_svcctl_QueryServiceLockStatusW(struct rpc_pipe_client *cli,
 					       TALLOC_CTX *mem_ctx,
-					       struct policy_handle *handle,
-					       uint32_t buf_size,
-					       struct SERVICE_LOCK_STATUS *lock_status,
-					       uint32_t *required_buf_size,
+					       struct policy_handle *handle /* [in] [ref] */,
+					       uint32_t buf_size /* [in]  */,
+					       struct SERVICE_LOCK_STATUS *lock_status /* [out] [ref] */,
+					       uint32_t *required_buf_size /* [out] [ref] */,
 					       WERROR *werror);
 NTSTATUS rpccli_svcctl_StartServiceW(struct rpc_pipe_client *cli,
 				     TALLOC_CTX *mem_ctx,
-				     struct policy_handle *handle,
-				     uint32_t NumArgs,
-				     const char *Arguments,
+				     struct policy_handle *handle /* [in] [ref] */,
+				     uint32_t NumArgs /* [in]  */,
+				     const char *Arguments /* [in] [unique,charset(UTF16)] */,
 				     WERROR *werror);
 NTSTATUS rpccli_svcctl_GetServiceDisplayNameW(struct rpc_pipe_client *cli,
 					      TALLOC_CTX *mem_ctx,
-					      struct policy_handle *handle,
-					      const char *service_name,
-					      const char **display_name,
-					      uint32_t *display_name_length,
+					      struct policy_handle *handle /* [in] [ref] */,
+					      const char *service_name /* [in] [unique,charset(UTF16)] */,
+					      const char **display_name /* [out] [ref,charset(UTF16)] */,
+					      uint32_t *display_name_length /* [in,out] [unique] */,
 					      WERROR *werror);
 NTSTATUS rpccli_svcctl_GetServiceKeyNameW(struct rpc_pipe_client *cli,
 					  TALLOC_CTX *mem_ctx,
-					  struct policy_handle *handle,
-					  const char *service_name,
-					  const char **key_name,
-					  uint32_t *display_name_length,
+					  struct policy_handle *handle /* [in] [ref] */,
+					  const char *service_name /* [in] [unique,charset(UTF16)] */,
+					  const char **key_name /* [out] [ref,charset(UTF16)] */,
+					  uint32_t *display_name_length /* [in,out] [unique] */,
 					  WERROR *werror);
 NTSTATUS rpccli_svcctl_SCSetServiceBitsA(struct rpc_pipe_client *cli,
 					 TALLOC_CTX *mem_ctx,
-					 struct policy_handle *handle,
-					 uint32_t bits,
-					 uint32_t bitson,
-					 uint32_t immediate,
+					 struct policy_handle *handle /* [in] [ref] */,
+					 uint32_t bits /* [in]  */,
+					 uint32_t bitson /* [in]  */,
+					 uint32_t immediate /* [in]  */,
 					 WERROR *werror);
 NTSTATUS rpccli_svcctl_ChangeServiceConfigA(struct rpc_pipe_client *cli,
 					    TALLOC_CTX *mem_ctx,
-					    struct policy_handle *handle,
-					    uint32_t type,
-					    uint32_t start,
-					    uint32_t error,
-					    const char *binary_path,
-					    const char *load_order_group,
-					    uint32_t *tag_id,
-					    const char *dependencies,
-					    const char *service_start_name,
-					    const char *password,
-					    const char *display_name,
+					    struct policy_handle *handle /* [in] [ref] */,
+					    uint32_t type /* [in]  */,
+					    uint32_t start /* [in]  */,
+					    uint32_t error /* [in]  */,
+					    const char *binary_path /* [in] [unique,charset(UTF16)] */,
+					    const char *load_order_group /* [in] [unique,charset(UTF16)] */,
+					    uint32_t *tag_id /* [out] [ref] */,
+					    const char *dependencies /* [in] [unique,charset(UTF16)] */,
+					    const char *service_start_name /* [in] [unique,charset(UTF16)] */,
+					    const char *password /* [in] [unique,charset(UTF16)] */,
+					    const char *display_name /* [in] [unique,charset(UTF16)] */,
 					    WERROR *werror);
 NTSTATUS rpccli_svcctl_CreateServiceA(struct rpc_pipe_client *cli,
 				      TALLOC_CTX *mem_ctx,
-				      struct policy_handle *handle,
-				      const char *ServiceName,
-				      const char *DisplayName,
-				      uint32_t desired_access,
-				      uint32_t type,
-				      uint32_t start_type,
-				      uint32_t error_control,
-				      const char *binary_path,
-				      const char *LoadOrderGroupKey,
-				      uint32_t *TagId,
-				      const char *dependencies,
-				      const char *service_start_name,
-				      const char *password,
+				      struct policy_handle *handle /* [in] [ref] */,
+				      const char *ServiceName /* [in] [unique,charset(UTF16)] */,
+				      const char *DisplayName /* [in] [unique,charset(UTF16)] */,
+				      uint32_t desired_access /* [in]  */,
+				      uint32_t type /* [in]  */,
+				      uint32_t start_type /* [in]  */,
+				      uint32_t error_control /* [in]  */,
+				      const char *binary_path /* [in] [unique,charset(UTF16)] */,
+				      const char *LoadOrderGroupKey /* [in] [unique,charset(UTF16)] */,
+				      uint32_t *TagId /* [out] [unique] */,
+				      const char *dependencies /* [in] [unique,charset(UTF16)] */,
+				      const char *service_start_name /* [in] [unique,charset(UTF16)] */,
+				      const char *password /* [in] [unique,charset(UTF16)] */,
 				      WERROR *werror);
 NTSTATUS rpccli_svcctl_EnumDependentServicesA(struct rpc_pipe_client *cli,
 					      TALLOC_CTX *mem_ctx,
-					      struct policy_handle *service,
-					      uint32_t state,
-					      struct ENUM_SERVICE_STATUS *service_status,
-					      uint32_t buf_size,
-					      uint32_t *bytes_needed,
-					      uint32_t *services_returned,
+					      struct policy_handle *service /* [in] [ref] */,
+					      uint32_t state /* [in]  */,
+					      struct ENUM_SERVICE_STATUS *service_status /* [out] [unique] */,
+					      uint32_t buf_size /* [in]  */,
+					      uint32_t *bytes_needed /* [out] [ref] */,
+					      uint32_t *services_returned /* [out] [ref] */,
 					      WERROR *werror);
 NTSTATUS rpccli_svcctl_EnumServicesStatusA(struct rpc_pipe_client *cli,
 					   TALLOC_CTX *mem_ctx,
-					   struct policy_handle *handle,
-					   uint32_t type,
-					   uint32_t state,
-					   uint32_t buf_size,
-					   uint8_t *service,
-					   uint32_t *bytes_needed,
-					   uint32_t *services_returned,
-					   uint32_t *resume_handle,
+					   struct policy_handle *handle /* [in] [ref] */,
+					   uint32_t type /* [in]  */,
+					   uint32_t state /* [in]  */,
+					   uint32_t buf_size /* [in]  */,
+					   uint8_t *service /* [out] [size_is(buf_size)] */,
+					   uint32_t *bytes_needed /* [out] [ref] */,
+					   uint32_t *services_returned /* [out] [ref] */,
+					   uint32_t *resume_handle /* [in,out] [unique] */,
 					   WERROR *werror);
 NTSTATUS rpccli_svcctl_OpenSCManagerA(struct rpc_pipe_client *cli,
 				      TALLOC_CTX *mem_ctx,
-				      const char *MachineName,
-				      const char *DatabaseName,
-				      uint32_t access_mask,
-				      struct policy_handle *handle,
+				      const char *MachineName /* [in] [unique,charset(UTF16)] */,
+				      const char *DatabaseName /* [in] [unique,charset(UTF16)] */,
+				      uint32_t access_mask /* [in]  */,
+				      struct policy_handle *handle /* [out] [ref] */,
 				      WERROR *werror);
 NTSTATUS rpccli_svcctl_OpenServiceA(struct rpc_pipe_client *cli,
 				    TALLOC_CTX *mem_ctx,
-				    struct policy_handle *scmanager_handle,
-				    const char *ServiceName,
-				    uint32_t access_mask,
+				    struct policy_handle *scmanager_handle /* [in] [ref] */,
+				    const char *ServiceName /* [in] [unique,charset(UTF16)] */,
+				    uint32_t access_mask /* [in]  */,
 				    WERROR *werror);
 NTSTATUS rpccli_svcctl_QueryServiceConfigA(struct rpc_pipe_client *cli,
 					   TALLOC_CTX *mem_ctx,
-					   struct policy_handle *handle,
-					   uint8_t *query,
-					   uint32_t buf_size,
-					   uint32_t *bytes_needed,
+					   struct policy_handle *handle /* [in] [ref] */,
+					   uint8_t *query /* [out]  */,
+					   uint32_t buf_size /* [in]  */,
+					   uint32_t *bytes_needed /* [out] [ref] */,
 					   WERROR *werror);
 NTSTATUS rpccli_svcctl_QueryServiceLockStatusA(struct rpc_pipe_client *cli,
 					       TALLOC_CTX *mem_ctx,
-					       struct policy_handle *handle,
-					       uint32_t buf_size,
-					       struct SERVICE_LOCK_STATUS *lock_status,
-					       uint32_t *required_buf_size,
+					       struct policy_handle *handle /* [in] [ref] */,
+					       uint32_t buf_size /* [in]  */,
+					       struct SERVICE_LOCK_STATUS *lock_status /* [out] [ref] */,
+					       uint32_t *required_buf_size /* [out] [ref] */,
 					       WERROR *werror);
 NTSTATUS rpccli_svcctl_StartServiceA(struct rpc_pipe_client *cli,
 				     TALLOC_CTX *mem_ctx,
-				     struct policy_handle *handle,
-				     uint32_t NumArgs,
-				     const char *Arguments,
+				     struct policy_handle *handle /* [in] [ref] */,
+				     uint32_t NumArgs /* [in]  */,
+				     const char *Arguments /* [in] [unique,charset(UTF16)] */,
 				     WERROR *werror);
 NTSTATUS rpccli_svcctl_GetServiceDisplayNameA(struct rpc_pipe_client *cli,
 					      TALLOC_CTX *mem_ctx,
-					      struct policy_handle *handle,
-					      const char *service_name,
-					      const char **display_name,
-					      uint32_t *display_name_length,
+					      struct policy_handle *handle /* [in] [ref] */,
+					      const char *service_name /* [in] [unique,charset(UTF16)] */,
+					      const char **display_name /* [out] [ref,charset(UTF16)] */,
+					      uint32_t *display_name_length /* [in,out] [unique] */,
 					      WERROR *werror);
 NTSTATUS rpccli_svcctl_GetServiceKeyNameA(struct rpc_pipe_client *cli,
 					  TALLOC_CTX *mem_ctx,
-					  struct policy_handle *handle,
-					  const char *service_name,
-					  const char **key_name,
-					  uint32_t *display_name_length,
+					  struct policy_handle *handle /* [in] [ref] */,
+					  const char *service_name /* [in] [unique,charset(UTF16)] */,
+					  const char **key_name /* [out] [ref,charset(UTF16)] */,
+					  uint32_t *display_name_length /* [in,out] [unique] */,
 					  WERROR *werror);
 NTSTATUS rpccli_svcctl_GetCurrentGroupeStateW(struct rpc_pipe_client *cli,
 					      TALLOC_CTX *mem_ctx,
@@ -270,65 +270,65 @@ NTSTATUS rpccli_svcctl_EnumServiceGroupW(struct rpc_pipe_client *cli,
 					 WERROR *werror);
 NTSTATUS rpccli_svcctl_ChangeServiceConfig2A(struct rpc_pipe_client *cli,
 					     TALLOC_CTX *mem_ctx,
-					     struct policy_handle *handle,
-					     uint32_t info_level,
-					     uint8_t *info,
+					     struct policy_handle *handle /* [in] [ref] */,
+					     uint32_t info_level /* [in]  */,
+					     uint8_t *info /* [in] [unique] */,
 					     WERROR *werror);
 NTSTATUS rpccli_svcctl_ChangeServiceConfig2W(struct rpc_pipe_client *cli,
 					     TALLOC_CTX *mem_ctx,
-					     struct policy_handle *handle,
-					     uint32_t info_level,
-					     uint8_t *info,
+					     struct policy_handle *handle /* [in] [ref] */,
+					     uint32_t info_level /* [in]  */,
+					     uint8_t *info /* [in] [unique] */,
 					     WERROR *werror);
 NTSTATUS rpccli_svcctl_QueryServiceConfig2A(struct rpc_pipe_client *cli,
 					    TALLOC_CTX *mem_ctx,
-					    struct policy_handle *handle,
-					    uint32_t info_level,
-					    uint8_t *buffer,
-					    uint32_t buf_size,
-					    uint32_t *bytes_needed,
+					    struct policy_handle *handle /* [in] [ref] */,
+					    uint32_t info_level /* [in]  */,
+					    uint8_t *buffer /* [out]  */,
+					    uint32_t buf_size /* [in]  */,
+					    uint32_t *bytes_needed /* [out] [ref] */,
 					    WERROR *werror);
 NTSTATUS rpccli_svcctl_QueryServiceConfig2W(struct rpc_pipe_client *cli,
 					    TALLOC_CTX *mem_ctx,
-					    struct policy_handle *handle,
-					    uint32_t info_level,
-					    uint8_t *buffer,
-					    uint32_t buf_size,
-					    uint32_t *bytes_needed,
+					    struct policy_handle *handle /* [in] [ref] */,
+					    uint32_t info_level /* [in]  */,
+					    uint8_t *buffer /* [out]  */,
+					    uint32_t buf_size /* [in]  */,
+					    uint32_t *bytes_needed /* [out] [ref] */,
 					    WERROR *werror);
 NTSTATUS rpccli_svcctl_QueryServiceStatusEx(struct rpc_pipe_client *cli,
 					    TALLOC_CTX *mem_ctx,
-					    struct policy_handle *handle,
-					    uint32_t info_level,
-					    uint8_t *buffer,
-					    uint32_t buf_size,
-					    uint32_t *bytes_needed,
+					    struct policy_handle *handle /* [in] [ref] */,
+					    uint32_t info_level /* [in]  */,
+					    uint8_t *buffer /* [out]  */,
+					    uint32_t buf_size /* [in]  */,
+					    uint32_t *bytes_needed /* [out] [ref] */,
 					    WERROR *werror);
 NTSTATUS rpccli_EnumServicesStatusExA(struct rpc_pipe_client *cli,
 				      TALLOC_CTX *mem_ctx,
-				      struct policy_handle *scmanager,
-				      uint32_t info_level,
-				      uint32_t type,
-				      uint32_t state,
-				      uint8_t *services,
-				      uint32_t buf_size,
-				      uint32_t *bytes_needed,
-				      uint32_t *service_returned,
-				      uint32_t *resume_handle,
-				      const char **group_name,
+				      struct policy_handle *scmanager /* [in] [ref] */,
+				      uint32_t info_level /* [in]  */,
+				      uint32_t type /* [in]  */,
+				      uint32_t state /* [in]  */,
+				      uint8_t *services /* [out]  */,
+				      uint32_t buf_size /* [in]  */,
+				      uint32_t *bytes_needed /* [out] [ref] */,
+				      uint32_t *service_returned /* [out] [ref] */,
+				      uint32_t *resume_handle /* [in,out] [unique] */,
+				      const char **group_name /* [out] [ref,charset(UTF16)] */,
 				      WERROR *werror);
 NTSTATUS rpccli_EnumServicesStatusExW(struct rpc_pipe_client *cli,
 				      TALLOC_CTX *mem_ctx,
-				      struct policy_handle *scmanager,
-				      uint32_t info_level,
-				      uint32_t type,
-				      uint32_t state,
-				      uint8_t *services,
-				      uint32_t buf_size,
-				      uint32_t *bytes_needed,
-				      uint32_t *service_returned,
-				      uint32_t *resume_handle,
-				      const char **group_name,
+				      struct policy_handle *scmanager /* [in] [ref] */,
+				      uint32_t info_level /* [in]  */,
+				      uint32_t type /* [in]  */,
+				      uint32_t state /* [in]  */,
+				      uint8_t *services /* [out]  */,
+				      uint32_t buf_size /* [in]  */,
+				      uint32_t *bytes_needed /* [out] [ref] */,
+				      uint32_t *service_returned /* [out] [ref] */,
+				      uint32_t *resume_handle /* [in,out] [unique] */,
+				      const char **group_name /* [out] [ref,charset(UTF16)] */,
 				      WERROR *werror);
 NTSTATUS rpccli_svcctl_SCSendTSMessage(struct rpc_pipe_client *cli,
 				       TALLOC_CTX *mem_ctx,
diff --git a/source3/librpc/gen_ndr/cli_winreg.c b/source3/librpc/gen_ndr/cli_winreg.c
index 38083a238c..b7cfffe86c 100644
--- a/source3/librpc/gen_ndr/cli_winreg.c
+++ b/source3/librpc/gen_ndr/cli_winreg.c
@@ -8,9 +8,9 @@
 
 NTSTATUS rpccli_winreg_OpenHKCR(struct rpc_pipe_client *cli,
 				TALLOC_CTX *mem_ctx,
-				uint16_t *system_name,
-				uint32_t access_mask,
-				struct policy_handle *handle,
+				uint16_t *system_name /* [in] [unique] */,
+				uint32_t access_mask /* [in]  */,
+				struct policy_handle *handle /* [out] [ref] */,
 				WERROR *werror)
 {
 	struct winreg_OpenHKCR r;
@@ -56,9 +56,9 @@ NTSTATUS rpccli_winreg_OpenHKCR(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_winreg_OpenHKCU(struct rpc_pipe_client *cli,
 				TALLOC_CTX *mem_ctx,
-				uint16_t *system_name,
-				uint32_t access_mask,
-				struct policy_handle *handle,
+				uint16_t *system_name /* [in] [unique] */,
+				uint32_t access_mask /* [in]  */,
+				struct policy_handle *handle /* [out] [ref] */,
 				WERROR *werror)
 {
 	struct winreg_OpenHKCU r;
@@ -104,9 +104,9 @@ NTSTATUS rpccli_winreg_OpenHKCU(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_winreg_OpenHKLM(struct rpc_pipe_client *cli,
 				TALLOC_CTX *mem_ctx,
-				uint16_t *system_name,
-				uint32_t access_mask,
-				struct policy_handle *handle,
+				uint16_t *system_name /* [in] [unique] */,
+				uint32_t access_mask /* [in]  */,
+				struct policy_handle *handle /* [out] [ref] */,
 				WERROR *werror)
 {
 	struct winreg_OpenHKLM r;
@@ -152,9 +152,9 @@ NTSTATUS rpccli_winreg_OpenHKLM(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_winreg_OpenHKPD(struct rpc_pipe_client *cli,
 				TALLOC_CTX *mem_ctx,
-				uint16_t *system_name,
-				uint32_t access_mask,
-				struct policy_handle *handle,
+				uint16_t *system_name /* [in] [unique] */,
+				uint32_t access_mask /* [in]  */,
+				struct policy_handle *handle /* [out] [ref] */,
 				WERROR *werror)
 {
 	struct winreg_OpenHKPD r;
@@ -200,9 +200,9 @@ NTSTATUS rpccli_winreg_OpenHKPD(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_winreg_OpenHKU(struct rpc_pipe_client *cli,
 			       TALLOC_CTX *mem_ctx,
-			       uint16_t *system_name,
-			       uint32_t access_mask,
-			       struct policy_handle *handle,
+			       uint16_t *system_name /* [in] [unique] */,
+			       uint32_t access_mask /* [in]  */,
+			       struct policy_handle *handle /* [out] [ref] */,
 			       WERROR *werror)
 {
 	struct winreg_OpenHKU r;
@@ -248,7 +248,7 @@ NTSTATUS rpccli_winreg_OpenHKU(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_winreg_CloseKey(struct rpc_pipe_client *cli,
 				TALLOC_CTX *mem_ctx,
-				struct policy_handle *handle,
+				struct policy_handle *handle /* [in,out] [ref] */,
 				WERROR *werror)
 {
 	struct winreg_CloseKey r;
@@ -293,14 +293,14 @@ NTSTATUS rpccli_winreg_CloseKey(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_winreg_CreateKey(struct rpc_pipe_client *cli,
 				 TALLOC_CTX *mem_ctx,
-				 struct policy_handle *handle,
-				 struct winreg_String name,
-				 struct winreg_String keyclass,
-				 uint32_t options,
-				 uint32_t access_mask,
-				 struct winreg_SecBuf *secdesc,
-				 struct policy_handle *new_handle,
-				 enum winreg_CreateAction *action_taken,
+				 struct policy_handle *handle /* [in] [ref] */,
+				 struct winreg_String name /* [in]  */,
+				 struct winreg_String keyclass /* [in]  */,
+				 uint32_t options /* [in]  */,
+				 uint32_t access_mask /* [in]  */,
+				 struct winreg_SecBuf *secdesc /* [in] [unique] */,
+				 struct policy_handle *new_handle /* [out] [ref] */,
+				 enum winreg_CreateAction *action_taken /* [in,out] [unique] */,
 				 WERROR *werror)
 {
 	struct winreg_CreateKey r;
@@ -354,8 +354,8 @@ NTSTATUS rpccli_winreg_CreateKey(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_winreg_DeleteKey(struct rpc_pipe_client *cli,
 				 TALLOC_CTX *mem_ctx,
-				 struct policy_handle *handle,
-				 struct winreg_String key,
+				 struct policy_handle *handle /* [in] [ref] */,
+				 struct winreg_String key /* [in]  */,
 				 WERROR *werror)
 {
 	struct winreg_DeleteKey r;
@@ -400,8 +400,8 @@ NTSTATUS rpccli_winreg_DeleteKey(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_winreg_DeleteValue(struct rpc_pipe_client *cli,
 				   TALLOC_CTX *mem_ctx,
-				   struct policy_handle *handle,
-				   struct winreg_String value,
+				   struct policy_handle *handle /* [in] [ref] */,
+				   struct winreg_String value /* [in]  */,
 				   WERROR *werror)
 {
 	struct winreg_DeleteValue r;
@@ -446,11 +446,11 @@ NTSTATUS rpccli_winreg_DeleteValue(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_winreg_EnumKey(struct rpc_pipe_client *cli,
 			       TALLOC_CTX *mem_ctx,
-			       struct policy_handle *handle,
-			       uint32_t enum_index,
-			       struct winreg_StringBuf *name,
-			       struct winreg_StringBuf *keyclass,
-			       NTTIME *last_changed_time,
+			       struct policy_handle *handle /* [in] [ref] */,
+			       uint32_t enum_index /* [in]  */,
+			       struct winreg_StringBuf *name /* [in,out] [ref] */,
+			       struct winreg_StringBuf *keyclass /* [in,out] [unique] */,
+			       NTTIME *last_changed_time /* [in,out] [unique] */,
 			       WERROR *werror)
 {
 	struct winreg_EnumKey r;
@@ -505,13 +505,13 @@ NTSTATUS rpccli_winreg_EnumKey(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_winreg_EnumValue(struct rpc_pipe_client *cli,
 				 TALLOC_CTX *mem_ctx,
-				 struct policy_handle *handle,
-				 uint32_t enum_index,
-				 struct winreg_ValNameBuf *name,
-				 enum winreg_Type *type,
-				 uint8_t *value,
-				 uint32_t *size,
-				 uint32_t *length,
+				 struct policy_handle *handle /* [in] [ref] */,
+				 uint32_t enum_index /* [in]  */,
+				 struct winreg_ValNameBuf *name /* [in,out] [ref] */,
+				 enum winreg_Type *type /* [in,out] [unique] */,
+				 uint8_t *value /* [in,out] [unique,length_is(*length),size_is(*size)] */,
+				 uint32_t *size /* [in,out] [unique] */,
+				 uint32_t *length /* [in,out] [unique] */,
 				 WERROR *werror)
 {
 	struct winreg_EnumValue r;
@@ -574,7 +574,7 @@ NTSTATUS rpccli_winreg_EnumValue(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_winreg_FlushKey(struct rpc_pipe_client *cli,
 				TALLOC_CTX *mem_ctx,
-				struct policy_handle *handle,
+				struct policy_handle *handle /* [in] [ref] */,
 				WERROR *werror)
 {
 	struct winreg_FlushKey r;
@@ -618,9 +618,9 @@ NTSTATUS rpccli_winreg_FlushKey(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_winreg_GetKeySecurity(struct rpc_pipe_client *cli,
 				      TALLOC_CTX *mem_ctx,
-				      struct policy_handle *handle,
-				      uint32_t sec_info,
-				      struct KeySecurityData *sd,
+				      struct policy_handle *handle /* [in] [ref] */,
+				      uint32_t sec_info /* [in]  */,
+				      struct KeySecurityData *sd /* [in,out] [ref] */,
 				      WERROR *werror)
 {
 	struct winreg_GetKeySecurity r;
@@ -667,9 +667,9 @@ NTSTATUS rpccli_winreg_GetKeySecurity(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_winreg_LoadKey(struct rpc_pipe_client *cli,
 			       TALLOC_CTX *mem_ctx,
-			       struct policy_handle *handle,
-			       struct winreg_String *keyname,
-			       struct winreg_String *filename,
+			       struct policy_handle *handle /* [in] [ref] */,
+			       struct winreg_String *keyname /* [in] [unique] */,
+			       struct winreg_String *filename /* [in] [unique] */,
 			       WERROR *werror)
 {
 	struct winreg_LoadKey r;
@@ -715,13 +715,13 @@ NTSTATUS rpccli_winreg_LoadKey(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_winreg_NotifyChangeKeyValue(struct rpc_pipe_client *cli,
 					    TALLOC_CTX *mem_ctx,
-					    struct policy_handle *handle,
-					    uint8_t watch_subtree,
-					    uint32_t notify_filter,
-					    uint32_t unknown,
-					    struct winreg_String string1,
-					    struct winreg_String string2,
-					    uint32_t unknown2,
+					    struct policy_handle *handle /* [in] [ref] */,
+					    uint8_t watch_subtree /* [in]  */,
+					    uint32_t notify_filter /* [in]  */,
+					    uint32_t unknown /* [in]  */,
+					    struct winreg_String string1 /* [in]  */,
+					    struct winreg_String string2 /* [in]  */,
+					    uint32_t unknown2 /* [in]  */,
 					    WERROR *werror)
 {
 	struct winreg_NotifyChangeKeyValue r;
@@ -771,11 +771,11 @@ NTSTATUS rpccli_winreg_NotifyChangeKeyValue(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_winreg_OpenKey(struct rpc_pipe_client *cli,
 			       TALLOC_CTX *mem_ctx,
-			       struct policy_handle *parent_handle,
-			       struct winreg_String keyname,
-			       uint32_t unknown,
-			       uint32_t access_mask,
-			       struct policy_handle *handle,
+			       struct policy_handle *parent_handle /* [in] [ref] */,
+			       struct winreg_String keyname /* [in]  */,
+			       uint32_t unknown /* [in]  */,
+			       uint32_t access_mask /* [in]  */,
+			       struct policy_handle *handle /* [out] [ref] */,
 			       WERROR *werror)
 {
 	struct winreg_OpenKey r;
@@ -823,16 +823,16 @@ NTSTATUS rpccli_winreg_OpenKey(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_winreg_QueryInfoKey(struct rpc_pipe_client *cli,
 				    TALLOC_CTX *mem_ctx,
-				    struct policy_handle *handle,
-				    struct winreg_String *classname,
-				    uint32_t *num_subkeys,
-				    uint32_t *max_subkeylen,
-				    uint32_t *max_classlen,
-				    uint32_t *num_values,
-				    uint32_t *max_valnamelen,
-				    uint32_t *max_valbufsize,
-				    uint32_t *secdescsize,
-				    NTTIME *last_changed_time,
+				    struct policy_handle *handle /* [in] [ref] */,
+				    struct winreg_String *classname /* [in,out] [ref] */,
+				    uint32_t *num_subkeys /* [out] [ref] */,
+				    uint32_t *max_subkeylen /* [out] [ref] */,
+				    uint32_t *max_classlen /* [out] [ref] */,
+				    uint32_t *num_values /* [out] [ref] */,
+				    uint32_t *max_valnamelen /* [out] [ref] */,
+				    uint32_t *max_valbufsize /* [out] [ref] */,
+				    uint32_t *secdescsize /* [out] [ref] */,
+				    NTTIME *last_changed_time /* [out] [ref] */,
 				    WERROR *werror)
 {
 	struct winreg_QueryInfoKey r;
@@ -886,12 +886,12 @@ NTSTATUS rpccli_winreg_QueryInfoKey(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_winreg_QueryValue(struct rpc_pipe_client *cli,
 				  TALLOC_CTX *mem_ctx,
-				  struct policy_handle *handle,
-				  struct winreg_String *value_name,
-				  enum winreg_Type *type,
-				  uint8_t *data,
-				  uint32_t *data_size,
-				  uint32_t *value_length,
+				  struct policy_handle *handle /* [in] [ref] */,
+				  struct winreg_String *value_name /* [in] [ref] */,
+				  enum winreg_Type *type /* [in,out] [unique] */,
+				  uint8_t *data /* [in,out] [unique,length_is(*value_length),size_is(*data_size)] */,
+				  uint32_t *data_size /* [in,out] [unique] */,
+				  uint32_t *value_length /* [in,out] [unique] */,
 				  WERROR *werror)
 {
 	struct winreg_QueryValue r;
@@ -994,9 +994,9 @@ NTSTATUS rpccli_winreg_ReplaceKey(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_winreg_RestoreKey(struct rpc_pipe_client *cli,
 				  TALLOC_CTX *mem_ctx,
-				  struct policy_handle *handle,
-				  struct winreg_String *filename,
-				  uint32_t flags,
+				  struct policy_handle *handle /* [in] [ref] */,
+				  struct winreg_String *filename /* [in] [ref] */,
+				  uint32_t flags /* [in]  */,
 				  WERROR *werror)
 {
 	struct winreg_RestoreKey r;
@@ -1042,9 +1042,9 @@ NTSTATUS rpccli_winreg_RestoreKey(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_winreg_SaveKey(struct rpc_pipe_client *cli,
 			       TALLOC_CTX *mem_ctx,
-			       struct policy_handle *handle,
-			       struct winreg_String *filename,
-			       struct KeySecurityAttribute *sec_attrib,
+			       struct policy_handle *handle /* [in] [ref] */,
+			       struct winreg_String *filename /* [in] [ref] */,
+			       struct KeySecurityAttribute *sec_attrib /* [in] [unique] */,
 			       WERROR *werror)
 {
 	struct winreg_SaveKey r;
@@ -1090,9 +1090,9 @@ NTSTATUS rpccli_winreg_SaveKey(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_winreg_SetKeySecurity(struct rpc_pipe_client *cli,
 				      TALLOC_CTX *mem_ctx,
-				      struct policy_handle *handle,
-				      uint32_t access_mask,
-				      struct KeySecurityData *sd,
+				      struct policy_handle *handle /* [in] [ref] */,
+				      uint32_t access_mask /* [in]  */,
+				      struct KeySecurityData *sd /* [in] [ref] */,
 				      WERROR *werror)
 {
 	struct winreg_SetKeySecurity r;
@@ -1138,11 +1138,11 @@ NTSTATUS rpccli_winreg_SetKeySecurity(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_winreg_SetValue(struct rpc_pipe_client *cli,
 				TALLOC_CTX *mem_ctx,
-				struct policy_handle *handle,
-				struct winreg_String name,
-				enum winreg_Type type,
-				uint8_t *data,
-				uint32_t size,
+				struct policy_handle *handle /* [in] [ref] */,
+				struct winreg_String name /* [in]  */,
+				enum winreg_Type type /* [in]  */,
+				uint8_t *data /* [in] [ref,size_is(size)] */,
+				uint32_t size /* [in]  */,
 				WERROR *werror)
 {
 	struct winreg_SetValue r;
@@ -1232,11 +1232,11 @@ NTSTATUS rpccli_winreg_UnLoadKey(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_winreg_InitiateSystemShutdown(struct rpc_pipe_client *cli,
 					      TALLOC_CTX *mem_ctx,
-					      uint16_t *hostname,
-					      struct initshutdown_String *message,
-					      uint32_t timeout,
-					      uint8_t force_apps,
-					      uint8_t reboot,
+					      uint16_t *hostname /* [in] [unique] */,
+					      struct initshutdown_String *message /* [in] [unique] */,
+					      uint32_t timeout /* [in]  */,
+					      uint8_t force_apps /* [in]  */,
+					      uint8_t reboot /* [in]  */,
 					      WERROR *werror)
 {
 	struct winreg_InitiateSystemShutdown r;
@@ -1284,7 +1284,7 @@ NTSTATUS rpccli_winreg_InitiateSystemShutdown(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_winreg_AbortSystemShutdown(struct rpc_pipe_client *cli,
 					   TALLOC_CTX *mem_ctx,
-					   uint16_t *server,
+					   uint16_t *server /* [in] [unique] */,
 					   WERROR *werror)
 {
 	struct winreg_AbortSystemShutdown r;
@@ -1328,8 +1328,8 @@ NTSTATUS rpccli_winreg_AbortSystemShutdown(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_winreg_GetVersion(struct rpc_pipe_client *cli,
 				  TALLOC_CTX *mem_ctx,
-				  struct policy_handle *handle,
-				  uint32_t *version,
+				  struct policy_handle *handle /* [in] [ref] */,
+				  uint32_t *version /* [out] [ref] */,
 				  WERROR *werror)
 {
 	struct winreg_GetVersion r;
@@ -1374,9 +1374,9 @@ NTSTATUS rpccli_winreg_GetVersion(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_winreg_OpenHKCC(struct rpc_pipe_client *cli,
 				TALLOC_CTX *mem_ctx,
-				uint16_t *system_name,
-				uint32_t access_mask,
-				struct policy_handle *handle,
+				uint16_t *system_name /* [in] [unique] */,
+				uint32_t access_mask /* [in]  */,
+				struct policy_handle *handle /* [out] [ref] */,
 				WERROR *werror)
 {
 	struct winreg_OpenHKCC r;
@@ -1422,9 +1422,9 @@ NTSTATUS rpccli_winreg_OpenHKCC(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_winreg_OpenHKDD(struct rpc_pipe_client *cli,
 				TALLOC_CTX *mem_ctx,
-				uint16_t *system_name,
-				uint32_t access_mask,
-				struct policy_handle *handle,
+				uint16_t *system_name /* [in] [unique] */,
+				uint32_t access_mask /* [in]  */,
+				struct policy_handle *handle /* [out] [ref] */,
 				WERROR *werror)
 {
 	struct winreg_OpenHKDD r;
@@ -1470,11 +1470,11 @@ NTSTATUS rpccli_winreg_OpenHKDD(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_winreg_QueryMultipleValues(struct rpc_pipe_client *cli,
 					   TALLOC_CTX *mem_ctx,
-					   struct policy_handle *key_handle,
-					   struct QueryMultipleValue *values,
-					   uint32_t num_values,
-					   uint8_t *buffer,
-					   uint32_t *buffer_size,
+					   struct policy_handle *key_handle /* [in] [ref] */,
+					   struct QueryMultipleValue *values /* [in,out] [ref,length_is(num_values),size_is(num_values)] */,
+					   uint32_t num_values /* [in]  */,
+					   uint8_t *buffer /* [in,out] [unique,length_is(*buffer_size),size_is(*buffer_size)] */,
+					   uint32_t *buffer_size /* [in,out] [ref] */,
 					   WERROR *werror)
 {
 	struct winreg_QueryMultipleValues r;
@@ -1527,12 +1527,12 @@ NTSTATUS rpccli_winreg_QueryMultipleValues(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_winreg_InitiateSystemShutdownEx(struct rpc_pipe_client *cli,
 						TALLOC_CTX *mem_ctx,
-						uint16_t *hostname,
-						struct initshutdown_String *message,
-						uint32_t timeout,
-						uint8_t force_apps,
-						uint8_t reboot,
-						uint32_t reason,
+						uint16_t *hostname /* [in] [unique] */,
+						struct initshutdown_String *message /* [in] [unique] */,
+						uint32_t timeout /* [in]  */,
+						uint8_t force_apps /* [in]  */,
+						uint8_t reboot /* [in]  */,
+						uint32_t reason /* [in]  */,
 						WERROR *werror)
 {
 	struct winreg_InitiateSystemShutdownEx r;
@@ -1623,9 +1623,9 @@ NTSTATUS rpccli_winreg_SaveKeyEx(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_winreg_OpenHKPT(struct rpc_pipe_client *cli,
 				TALLOC_CTX *mem_ctx,
-				uint16_t *system_name,
-				uint32_t access_mask,
-				struct policy_handle *handle,
+				uint16_t *system_name /* [in] [unique] */,
+				uint32_t access_mask /* [in]  */,
+				struct policy_handle *handle /* [out] [ref] */,
 				WERROR *werror)
 {
 	struct winreg_OpenHKPT r;
@@ -1671,9 +1671,9 @@ NTSTATUS rpccli_winreg_OpenHKPT(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_winreg_OpenHKPN(struct rpc_pipe_client *cli,
 				TALLOC_CTX *mem_ctx,
-				uint16_t *system_name,
-				uint32_t access_mask,
-				struct policy_handle *handle,
+				uint16_t *system_name /* [in] [unique] */,
+				uint32_t access_mask /* [in]  */,
+				struct policy_handle *handle /* [out] [ref] */,
 				WERROR *werror)
 {
 	struct winreg_OpenHKPN r;
diff --git a/source3/librpc/gen_ndr/cli_winreg.h b/source3/librpc/gen_ndr/cli_winreg.h
index 361fcff8c3..8fc7610b05 100644
--- a/source3/librpc/gen_ndr/cli_winreg.h
+++ b/source3/librpc/gen_ndr/cli_winreg.h
@@ -3,225 +3,225 @@
 #define __CLI_WINREG__
 NTSTATUS rpccli_winreg_OpenHKCR(struct rpc_pipe_client *cli,
 				TALLOC_CTX *mem_ctx,
-				uint16_t *system_name,
-				uint32_t access_mask,
-				struct policy_handle *handle,
+				uint16_t *system_name /* [in] [unique] */,
+				uint32_t access_mask /* [in]  */,
+				struct policy_handle *handle /* [out] [ref] */,
 				WERROR *werror);
 NTSTATUS rpccli_winreg_OpenHKCU(struct rpc_pipe_client *cli,
 				TALLOC_CTX *mem_ctx,
-				uint16_t *system_name,
-				uint32_t access_mask,
-				struct policy_handle *handle,
+				uint16_t *system_name /* [in] [unique] */,
+				uint32_t access_mask /* [in]  */,
+				struct policy_handle *handle /* [out] [ref] */,
 				WERROR *werror);
 NTSTATUS rpccli_winreg_OpenHKLM(struct rpc_pipe_client *cli,
 				TALLOC_CTX *mem_ctx,
-				uint16_t *system_name,
-				uint32_t access_mask,
-				struct policy_handle *handle,
+				uint16_t *system_name /* [in] [unique] */,
+				uint32_t access_mask /* [in]  */,
+				struct policy_handle *handle /* [out] [ref] */,
 				WERROR *werror);
 NTSTATUS rpccli_winreg_OpenHKPD(struct rpc_pipe_client *cli,
 				TALLOC_CTX *mem_ctx,
-				uint16_t *system_name,
-				uint32_t access_mask,
-				struct policy_handle *handle,
+				uint16_t *system_name /* [in] [unique] */,
+				uint32_t access_mask /* [in]  */,
+				struct policy_handle *handle /* [out] [ref] */,
 				WERROR *werror);
 NTSTATUS rpccli_winreg_OpenHKU(struct rpc_pipe_client *cli,
 			       TALLOC_CTX *mem_ctx,
-			       uint16_t *system_name,
-			       uint32_t access_mask,
-			       struct policy_handle *handle,
+			       uint16_t *system_name /* [in] [unique] */,
+			       uint32_t access_mask /* [in]  */,
+			       struct policy_handle *handle /* [out] [ref] */,
 			       WERROR *werror);
 NTSTATUS rpccli_winreg_CloseKey(struct rpc_pipe_client *cli,
 				TALLOC_CTX *mem_ctx,
-				struct policy_handle *handle,
+				struct policy_handle *handle /* [in,out] [ref] */,
 				WERROR *werror);
 NTSTATUS rpccli_winreg_CreateKey(struct rpc_pipe_client *cli,
 				 TALLOC_CTX *mem_ctx,
-				 struct policy_handle *handle,
-				 struct winreg_String name,
-				 struct winreg_String keyclass,
-				 uint32_t options,
-				 uint32_t access_mask,
-				 struct winreg_SecBuf *secdesc,
-				 struct policy_handle *new_handle,
-				 enum winreg_CreateAction *action_taken,
+				 struct policy_handle *handle /* [in] [ref] */,
+				 struct winreg_String name /* [in]  */,
+				 struct winreg_String keyclass /* [in]  */,
+				 uint32_t options /* [in]  */,
+				 uint32_t access_mask /* [in]  */,
+				 struct winreg_SecBuf *secdesc /* [in] [unique] */,
+				 struct policy_handle *new_handle /* [out] [ref] */,
+				 enum winreg_CreateAction *action_taken /* [in,out] [unique] */,
 				 WERROR *werror);
 NTSTATUS rpccli_winreg_DeleteKey(struct rpc_pipe_client *cli,
 				 TALLOC_CTX *mem_ctx,
-				 struct policy_handle *handle,
-				 struct winreg_String key,
+				 struct policy_handle *handle /* [in] [ref] */,
+				 struct winreg_String key /* [in]  */,
 				 WERROR *werror);
 NTSTATUS rpccli_winreg_DeleteValue(struct rpc_pipe_client *cli,
 				   TALLOC_CTX *mem_ctx,
-				   struct policy_handle *handle,
-				   struct winreg_String value,
+				   struct policy_handle *handle /* [in] [ref] */,
+				   struct winreg_String value /* [in]  */,
 				   WERROR *werror);
 NTSTATUS rpccli_winreg_EnumKey(struct rpc_pipe_client *cli,
 			       TALLOC_CTX *mem_ctx,
-			       struct policy_handle *handle,
-			       uint32_t enum_index,
-			       struct winreg_StringBuf *name,
-			       struct winreg_StringBuf *keyclass,
-			       NTTIME *last_changed_time,
+			       struct policy_handle *handle /* [in] [ref] */,
+			       uint32_t enum_index /* [in]  */,
+			       struct winreg_StringBuf *name /* [in,out] [ref] */,
+			       struct winreg_StringBuf *keyclass /* [in,out] [unique] */,
+			       NTTIME *last_changed_time /* [in,out] [unique] */,
 			       WERROR *werror);
 NTSTATUS rpccli_winreg_EnumValue(struct rpc_pipe_client *cli,
 				 TALLOC_CTX *mem_ctx,
-				 struct policy_handle *handle,
-				 uint32_t enum_index,
-				 struct winreg_ValNameBuf *name,
-				 enum winreg_Type *type,
-				 uint8_t *value,
-				 uint32_t *size,
-				 uint32_t *length,
+				 struct policy_handle *handle /* [in] [ref] */,
+				 uint32_t enum_index /* [in]  */,
+				 struct winreg_ValNameBuf *name /* [in,out] [ref] */,
+				 enum winreg_Type *type /* [in,out] [unique] */,
+				 uint8_t *value /* [in,out] [unique,length_is(*length),size_is(*size)] */,
+				 uint32_t *size /* [in,out] [unique] */,
+				 uint32_t *length /* [in,out] [unique] */,
 				 WERROR *werror);
 NTSTATUS rpccli_winreg_FlushKey(struct rpc_pipe_client *cli,
 				TALLOC_CTX *mem_ctx,
-				struct policy_handle *handle,
+				struct policy_handle *handle /* [in] [ref] */,
 				WERROR *werror);
 NTSTATUS rpccli_winreg_GetKeySecurity(struct rpc_pipe_client *cli,
 				      TALLOC_CTX *mem_ctx,
-				      struct policy_handle *handle,
-				      uint32_t sec_info,
-				      struct KeySecurityData *sd,
+				      struct policy_handle *handle /* [in] [ref] */,
+				      uint32_t sec_info /* [in]  */,
+				      struct KeySecurityData *sd /* [in,out] [ref] */,
 				      WERROR *werror);
 NTSTATUS rpccli_winreg_LoadKey(struct rpc_pipe_client *cli,
 			       TALLOC_CTX *mem_ctx,
-			       struct policy_handle *handle,
-			       struct winreg_String *keyname,
-			       struct winreg_String *filename,
+			       struct policy_handle *handle /* [in] [ref] */,
+			       struct winreg_String *keyname /* [in] [unique] */,
+			       struct winreg_String *filename /* [in] [unique] */,
 			       WERROR *werror);
 NTSTATUS rpccli_winreg_NotifyChangeKeyValue(struct rpc_pipe_client *cli,
 					    TALLOC_CTX *mem_ctx,
-					    struct policy_handle *handle,
-					    uint8_t watch_subtree,
-					    uint32_t notify_filter,
-					    uint32_t unknown,
-					    struct winreg_String string1,
-					    struct winreg_String string2,
-					    uint32_t unknown2,
+					    struct policy_handle *handle /* [in] [ref] */,
+					    uint8_t watch_subtree /* [in]  */,
+					    uint32_t notify_filter /* [in]  */,
+					    uint32_t unknown /* [in]  */,
+					    struct winreg_String string1 /* [in]  */,
+					    struct winreg_String string2 /* [in]  */,
+					    uint32_t unknown2 /* [in]  */,
 					    WERROR *werror);
 NTSTATUS rpccli_winreg_OpenKey(struct rpc_pipe_client *cli,
 			       TALLOC_CTX *mem_ctx,
-			       struct policy_handle *parent_handle,
-			       struct winreg_String keyname,
-			       uint32_t unknown,
-			       uint32_t access_mask,
-			       struct policy_handle *handle,
+			       struct policy_handle *parent_handle /* [in] [ref] */,
+			       struct winreg_String keyname /* [in]  */,
+			       uint32_t unknown /* [in]  */,
+			       uint32_t access_mask /* [in]  */,
+			       struct policy_handle *handle /* [out] [ref] */,
 			       WERROR *werror);
 NTSTATUS rpccli_winreg_QueryInfoKey(struct rpc_pipe_client *cli,
 				    TALLOC_CTX *mem_ctx,
-				    struct policy_handle *handle,
-				    struct winreg_String *classname,
-				    uint32_t *num_subkeys,
-				    uint32_t *max_subkeylen,
-				    uint32_t *max_classlen,
-				    uint32_t *num_values,
-				    uint32_t *max_valnamelen,
-				    uint32_t *max_valbufsize,
-				    uint32_t *secdescsize,
-				    NTTIME *last_changed_time,
+				    struct policy_handle *handle /* [in] [ref] */,
+				    struct winreg_String *classname /* [in,out] [ref] */,
+				    uint32_t *num_subkeys /* [out] [ref] */,
+				    uint32_t *max_subkeylen /* [out] [ref] */,
+				    uint32_t *max_classlen /* [out] [ref] */,
+				    uint32_t *num_values /* [out] [ref] */,
+				    uint32_t *max_valnamelen /* [out] [ref] */,
+				    uint32_t *max_valbufsize /* [out] [ref] */,
+				    uint32_t *secdescsize /* [out] [ref] */,
+				    NTTIME *last_changed_time /* [out] [ref] */,
 				    WERROR *werror);
 NTSTATUS rpccli_winreg_QueryValue(struct rpc_pipe_client *cli,
 				  TALLOC_CTX *mem_ctx,
-				  struct policy_handle *handle,
-				  struct winreg_String *value_name,
-				  enum winreg_Type *type,
-				  uint8_t *data,
-				  uint32_t *data_size,
-				  uint32_t *value_length,
+				  struct policy_handle *handle /* [in] [ref] */,
+				  struct winreg_String *value_name /* [in] [ref] */,
+				  enum winreg_Type *type /* [in,out] [unique] */,
+				  uint8_t *data /* [in,out] [unique,length_is(*value_length),size_is(*data_size)] */,
+				  uint32_t *data_size /* [in,out] [unique] */,
+				  uint32_t *value_length /* [in,out] [unique] */,
 				  WERROR *werror);
 NTSTATUS rpccli_winreg_ReplaceKey(struct rpc_pipe_client *cli,
 				  TALLOC_CTX *mem_ctx,
 				  WERROR *werror);
 NTSTATUS rpccli_winreg_RestoreKey(struct rpc_pipe_client *cli,
 				  TALLOC_CTX *mem_ctx,
-				  struct policy_handle *handle,
-				  struct winreg_String *filename,
-				  uint32_t flags,
+				  struct policy_handle *handle /* [in] [ref] */,
+				  struct winreg_String *filename /* [in] [ref] */,
+				  uint32_t flags /* [in]  */,
 				  WERROR *werror);
 NTSTATUS rpccli_winreg_SaveKey(struct rpc_pipe_client *cli,
 			       TALLOC_CTX *mem_ctx,
-			       struct policy_handle *handle,
-			       struct winreg_String *filename,
-			       struct KeySecurityAttribute *sec_attrib,
+			       struct policy_handle *handle /* [in] [ref] */,
+			       struct winreg_String *filename /* [in] [ref] */,
+			       struct KeySecurityAttribute *sec_attrib /* [in] [unique] */,
 			       WERROR *werror);
 NTSTATUS rpccli_winreg_SetKeySecurity(struct rpc_pipe_client *cli,
 				      TALLOC_CTX *mem_ctx,
-				      struct policy_handle *handle,
-				      uint32_t access_mask,
-				      struct KeySecurityData *sd,
+				      struct policy_handle *handle /* [in] [ref] */,
+				      uint32_t access_mask /* [in]  */,
+				      struct KeySecurityData *sd /* [in] [ref] */,
 				      WERROR *werror);
 NTSTATUS rpccli_winreg_SetValue(struct rpc_pipe_client *cli,
 				TALLOC_CTX *mem_ctx,
-				struct policy_handle *handle,
-				struct winreg_String name,
-				enum winreg_Type type,
-				uint8_t *data,
-				uint32_t size,
+				struct policy_handle *handle /* [in] [ref] */,
+				struct winreg_String name /* [in]  */,
+				enum winreg_Type type /* [in]  */,
+				uint8_t *data /* [in] [ref,size_is(size)] */,
+				uint32_t size /* [in]  */,
 				WERROR *werror);
 NTSTATUS rpccli_winreg_UnLoadKey(struct rpc_pipe_client *cli,
 				 TALLOC_CTX *mem_ctx,
 				 WERROR *werror);
 NTSTATUS rpccli_winreg_InitiateSystemShutdown(struct rpc_pipe_client *cli,
 					      TALLOC_CTX *mem_ctx,
-					      uint16_t *hostname,
-					      struct initshutdown_String *message,
-					      uint32_t timeout,
-					      uint8_t force_apps,
-					      uint8_t reboot,
+					      uint16_t *hostname /* [in] [unique] */,
+					      struct initshutdown_String *message /* [in] [unique] */,
+					      uint32_t timeout /* [in]  */,
+					      uint8_t force_apps /* [in]  */,
+					      uint8_t reboot /* [in]  */,
 					      WERROR *werror);
 NTSTATUS rpccli_winreg_AbortSystemShutdown(struct rpc_pipe_client *cli,
 					   TALLOC_CTX *mem_ctx,
-					   uint16_t *server,
+					   uint16_t *server /* [in] [unique] */,
 					   WERROR *werror);
 NTSTATUS rpccli_winreg_GetVersion(struct rpc_pipe_client *cli,
 				  TALLOC_CTX *mem_ctx,
-				  struct policy_handle *handle,
-				  uint32_t *version,
+				  struct policy_handle *handle /* [in] [ref] */,
+				  uint32_t *version /* [out] [ref] */,
 				  WERROR *werror);
 NTSTATUS rpccli_winreg_OpenHKCC(struct rpc_pipe_client *cli,
 				TALLOC_CTX *mem_ctx,
-				uint16_t *system_name,
-				uint32_t access_mask,
-				struct policy_handle *handle,
+				uint16_t *system_name /* [in] [unique] */,
+				uint32_t access_mask /* [in]  */,
+				struct policy_handle *handle /* [out] [ref] */,
 				WERROR *werror);
 NTSTATUS rpccli_winreg_OpenHKDD(struct rpc_pipe_client *cli,
 				TALLOC_CTX *mem_ctx,
-				uint16_t *system_name,
-				uint32_t access_mask,
-				struct policy_handle *handle,
+				uint16_t *system_name /* [in] [unique] */,
+				uint32_t access_mask /* [in]  */,
+				struct policy_handle *handle /* [out] [ref] */,
 				WERROR *werror);
 NTSTATUS rpccli_winreg_QueryMultipleValues(struct rpc_pipe_client *cli,
 					   TALLOC_CTX *mem_ctx,
-					   struct policy_handle *key_handle,
-					   struct QueryMultipleValue *values,
-					   uint32_t num_values,
-					   uint8_t *buffer,
-					   uint32_t *buffer_size,
+					   struct policy_handle *key_handle /* [in] [ref] */,
+					   struct QueryMultipleValue *values /* [in,out] [ref,length_is(num_values),size_is(num_values)] */,
+					   uint32_t num_values /* [in]  */,
+					   uint8_t *buffer /* [in,out] [unique,length_is(*buffer_size),size_is(*buffer_size)] */,
+					   uint32_t *buffer_size /* [in,out] [ref] */,
 					   WERROR *werror);
 NTSTATUS rpccli_winreg_InitiateSystemShutdownEx(struct rpc_pipe_client *cli,
 						TALLOC_CTX *mem_ctx,
-						uint16_t *hostname,
-						struct initshutdown_String *message,
-						uint32_t timeout,
-						uint8_t force_apps,
-						uint8_t reboot,
-						uint32_t reason,
+						uint16_t *hostname /* [in] [unique] */,
+						struct initshutdown_String *message /* [in] [unique] */,
+						uint32_t timeout /* [in]  */,
+						uint8_t force_apps /* [in]  */,
+						uint8_t reboot /* [in]  */,
+						uint32_t reason /* [in]  */,
 						WERROR *werror);
 NTSTATUS rpccli_winreg_SaveKeyEx(struct rpc_pipe_client *cli,
 				 TALLOC_CTX *mem_ctx,
 				 WERROR *werror);
 NTSTATUS rpccli_winreg_OpenHKPT(struct rpc_pipe_client *cli,
 				TALLOC_CTX *mem_ctx,
-				uint16_t *system_name,
-				uint32_t access_mask,
-				struct policy_handle *handle,
+				uint16_t *system_name /* [in] [unique] */,
+				uint32_t access_mask /* [in]  */,
+				struct policy_handle *handle /* [out] [ref] */,
 				WERROR *werror);
 NTSTATUS rpccli_winreg_OpenHKPN(struct rpc_pipe_client *cli,
 				TALLOC_CTX *mem_ctx,
-				uint16_t *system_name,
-				uint32_t access_mask,
-				struct policy_handle *handle,
+				uint16_t *system_name /* [in] [unique] */,
+				uint32_t access_mask /* [in]  */,
+				struct policy_handle *handle /* [out] [ref] */,
 				WERROR *werror);
 NTSTATUS rpccli_winreg_QueryMultipleValues2(struct rpc_pipe_client *cli,
 					    TALLOC_CTX *mem_ctx,
diff --git a/source3/librpc/gen_ndr/cli_wkssvc.c b/source3/librpc/gen_ndr/cli_wkssvc.c
index adaa3dd7bd..bf9ce611b6 100644
--- a/source3/librpc/gen_ndr/cli_wkssvc.c
+++ b/source3/librpc/gen_ndr/cli_wkssvc.c
@@ -8,9 +8,9 @@
 
 NTSTATUS rpccli_wkssvc_NetWkstaGetInfo(struct rpc_pipe_client *cli,
 				       TALLOC_CTX *mem_ctx,
-				       const char *server_name,
-				       uint32_t level,
-				       union wkssvc_NetWkstaInfo *info,
+				       const char *server_name /* [in] [unique,charset(UTF16)] */,
+				       uint32_t level /* [in]  */,
+				       union wkssvc_NetWkstaInfo *info /* [out] [ref,switch_is(level)] */,
 				       WERROR *werror)
 {
 	struct wkssvc_NetWkstaGetInfo r;
@@ -56,10 +56,10 @@ NTSTATUS rpccli_wkssvc_NetWkstaGetInfo(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_wkssvc_NetWkstaSetInfo(struct rpc_pipe_client *cli,
 				       TALLOC_CTX *mem_ctx,
-				       const char *server_name,
-				       uint32_t level,
-				       union wkssvc_NetWkstaInfo *info,
-				       uint32_t *parm_error,
+				       const char *server_name /* [in] [unique,charset(UTF16)] */,
+				       uint32_t level /* [in]  */,
+				       union wkssvc_NetWkstaInfo *info /* [in] [ref,switch_is(level)] */,
+				       uint32_t *parm_error /* [in,out] [ref] */,
 				       WERROR *werror)
 {
 	struct wkssvc_NetWkstaSetInfo r;
@@ -107,11 +107,11 @@ NTSTATUS rpccli_wkssvc_NetWkstaSetInfo(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_wkssvc_NetWkstaEnumUsers(struct rpc_pipe_client *cli,
 					 TALLOC_CTX *mem_ctx,
-					 const char *server_name,
-					 struct wkssvc_NetWkstaEnumUsersInfo *info,
-					 uint32_t prefmaxlen,
-					 uint32_t *entries_read,
-					 uint32_t *resume_handle,
+					 const char *server_name /* [in] [unique,charset(UTF16)] */,
+					 struct wkssvc_NetWkstaEnumUsersInfo *info /* [in,out] [ref] */,
+					 uint32_t prefmaxlen /* [in]  */,
+					 uint32_t *entries_read /* [out] [ref] */,
+					 uint32_t *resume_handle /* [in,out] [unique] */,
 					 WERROR *werror)
 {
 	struct wkssvc_NetWkstaEnumUsers r;
@@ -163,9 +163,9 @@ NTSTATUS rpccli_wkssvc_NetWkstaEnumUsers(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_wkssvc_NetrWkstaUserGetInfo(struct rpc_pipe_client *cli,
 					    TALLOC_CTX *mem_ctx,
-					    const char *unknown,
-					    uint32_t level,
-					    union wkssvc_NetrWkstaUserInfo *info,
+					    const char *unknown /* [in] [unique,charset(UTF16)] */,
+					    uint32_t level /* [in]  */,
+					    union wkssvc_NetrWkstaUserInfo *info /* [out] [ref,switch_is(level)] */,
 					    WERROR *werror)
 {
 	struct wkssvc_NetrWkstaUserGetInfo r;
@@ -211,10 +211,10 @@ NTSTATUS rpccli_wkssvc_NetrWkstaUserGetInfo(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_wkssvc_NetrWkstaUserSetInfo(struct rpc_pipe_client *cli,
 					    TALLOC_CTX *mem_ctx,
-					    const char *unknown,
-					    uint32_t level,
-					    union wkssvc_NetrWkstaUserInfo *info,
-					    uint32_t *parm_err,
+					    const char *unknown /* [in] [unique,charset(UTF16)] */,
+					    uint32_t level /* [in]  */,
+					    union wkssvc_NetrWkstaUserInfo *info /* [in] [ref,switch_is(level)] */,
+					    uint32_t *parm_err /* [in,out] [unique] */,
 					    WERROR *werror)
 {
 	struct wkssvc_NetrWkstaUserSetInfo r;
@@ -264,11 +264,11 @@ NTSTATUS rpccli_wkssvc_NetrWkstaUserSetInfo(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_wkssvc_NetWkstaTransportEnum(struct rpc_pipe_client *cli,
 					     TALLOC_CTX *mem_ctx,
-					     const char *server_name,
-					     struct wkssvc_NetWkstaTransportInfo *info,
-					     uint32_t max_buffer,
-					     uint32_t *total_entries,
-					     uint32_t *resume_handle,
+					     const char *server_name /* [in] [unique,charset(UTF16)] */,
+					     struct wkssvc_NetWkstaTransportInfo *info /* [in,out] [ref] */,
+					     uint32_t max_buffer /* [in]  */,
+					     uint32_t *total_entries /* [out] [ref] */,
+					     uint32_t *resume_handle /* [in,out] [unique] */,
 					     WERROR *werror)
 {
 	struct wkssvc_NetWkstaTransportEnum r;
@@ -320,10 +320,10 @@ NTSTATUS rpccli_wkssvc_NetWkstaTransportEnum(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_wkssvc_NetrWkstaTransportAdd(struct rpc_pipe_client *cli,
 					     TALLOC_CTX *mem_ctx,
-					     const char *server_name,
-					     uint32_t level,
-					     struct wkssvc_NetWkstaTransportInfo0 *info0,
-					     uint32_t *parm_err,
+					     const char *server_name /* [in] [unique,charset(UTF16)] */,
+					     uint32_t level /* [in]  */,
+					     struct wkssvc_NetWkstaTransportInfo0 *info0 /* [in] [ref] */,
+					     uint32_t *parm_err /* [in,out] [unique] */,
 					     WERROR *werror)
 {
 	struct wkssvc_NetrWkstaTransportAdd r;
@@ -373,9 +373,9 @@ NTSTATUS rpccli_wkssvc_NetrWkstaTransportAdd(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_wkssvc_NetrWkstaTransportDel(struct rpc_pipe_client *cli,
 					     TALLOC_CTX *mem_ctx,
-					     const char *server_name,
-					     const char *transport_name,
-					     uint32_t unknown3,
+					     const char *server_name /* [in] [unique,charset(UTF16)] */,
+					     const char *transport_name /* [in] [unique,charset(UTF16)] */,
+					     uint32_t unknown3 /* [in]  */,
 					     WERROR *werror)
 {
 	struct wkssvc_NetrWkstaTransportDel r;
@@ -421,10 +421,10 @@ NTSTATUS rpccli_wkssvc_NetrWkstaTransportDel(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_wkssvc_NetrUseAdd(struct rpc_pipe_client *cli,
 				  TALLOC_CTX *mem_ctx,
-				  const char *server_name,
-				  uint32_t level,
-				  union wkssvc_NetrUseGetInfoCtr *ctr,
-				  uint32_t *parm_err,
+				  const char *server_name /* [in] [unique,charset(UTF16)] */,
+				  uint32_t level /* [in]  */,
+				  union wkssvc_NetrUseGetInfoCtr *ctr /* [in] [ref,switch_is(level)] */,
+				  uint32_t *parm_err /* [in,out] [unique] */,
 				  WERROR *werror)
 {
 	struct wkssvc_NetrUseAdd r;
@@ -474,10 +474,10 @@ NTSTATUS rpccli_wkssvc_NetrUseAdd(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_wkssvc_NetrUseGetInfo(struct rpc_pipe_client *cli,
 				      TALLOC_CTX *mem_ctx,
-				      const char *server_name,
-				      const char *use_name,
-				      uint32_t level,
-				      union wkssvc_NetrUseGetInfoCtr *ctr,
+				      const char *server_name /* [in] [unique,charset(UTF16)] */,
+				      const char *use_name /* [in] [ref,charset(UTF16)] */,
+				      uint32_t level /* [in]  */,
+				      union wkssvc_NetrUseGetInfoCtr *ctr /* [out] [ref,switch_is(level)] */,
 				      WERROR *werror)
 {
 	struct wkssvc_NetrUseGetInfo r;
@@ -524,9 +524,9 @@ NTSTATUS rpccli_wkssvc_NetrUseGetInfo(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_wkssvc_NetrUseDel(struct rpc_pipe_client *cli,
 				  TALLOC_CTX *mem_ctx,
-				  const char *server_name,
-				  const char *use_name,
-				  uint32_t force_cond,
+				  const char *server_name /* [in] [unique,charset(UTF16)] */,
+				  const char *use_name /* [in] [ref,charset(UTF16)] */,
+				  uint32_t force_cond /* [in]  */,
 				  WERROR *werror)
 {
 	struct wkssvc_NetrUseDel r;
@@ -572,11 +572,11 @@ NTSTATUS rpccli_wkssvc_NetrUseDel(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_wkssvc_NetrUseEnum(struct rpc_pipe_client *cli,
 				   TALLOC_CTX *mem_ctx,
-				   const char *server_name,
-				   struct wkssvc_NetrUseEnumInfo *info,
-				   uint32_t prefmaxlen,
-				   uint32_t *entries_read,
-				   uint32_t *resume_handle,
+				   const char *server_name /* [in] [unique,charset(UTF16)] */,
+				   struct wkssvc_NetrUseEnumInfo *info /* [in,out] [ref] */,
+				   uint32_t prefmaxlen /* [in]  */,
+				   uint32_t *entries_read /* [out] [ref] */,
+				   uint32_t *resume_handle /* [in,out] [unique] */,
 				   WERROR *werror)
 {
 	struct wkssvc_NetrUseEnum r;
@@ -628,11 +628,11 @@ NTSTATUS rpccli_wkssvc_NetrUseEnum(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_wkssvc_NetrMessageBufferSend(struct rpc_pipe_client *cli,
 					     TALLOC_CTX *mem_ctx,
-					     const char *server_name,
-					     const char *message_name,
-					     const char *message_sender_name,
-					     uint8_t *message_buffer,
-					     uint32_t message_size,
+					     const char *server_name /* [in] [unique,charset(UTF16)] */,
+					     const char *message_name /* [in] [ref,charset(UTF16)] */,
+					     const char *message_sender_name /* [in] [unique,charset(UTF16)] */,
+					     uint8_t *message_buffer /* [in] [ref,size_is(message_size)] */,
+					     uint32_t message_size /* [in]  */,
 					     WERROR *werror)
 {
 	struct wkssvc_NetrMessageBufferSend r;
@@ -680,11 +680,11 @@ NTSTATUS rpccli_wkssvc_NetrMessageBufferSend(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_wkssvc_NetrWorkstationStatisticsGet(struct rpc_pipe_client *cli,
 						    TALLOC_CTX *mem_ctx,
-						    const char *server_name,
-						    const char *unknown2,
-						    uint32_t unknown3,
-						    uint32_t unknown4,
-						    struct wkssvc_NetrWorkstationStatistics **info,
+						    const char *server_name /* [in] [unique,charset(UTF16)] */,
+						    const char *unknown2 /* [in] [unique,charset(UTF16)] */,
+						    uint32_t unknown3 /* [in]  */,
+						    uint32_t unknown4 /* [in]  */,
+						    struct wkssvc_NetrWorkstationStatistics **info /* [out] [ref] */,
 						    WERROR *werror)
 {
 	struct wkssvc_NetrWorkstationStatisticsGet r;
@@ -732,7 +732,7 @@ NTSTATUS rpccli_wkssvc_NetrWorkstationStatisticsGet(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_wkssvc_NetrLogonDomainNameAdd(struct rpc_pipe_client *cli,
 					      TALLOC_CTX *mem_ctx,
-					      const char *domain_name,
+					      const char *domain_name /* [in] [ref,charset(UTF16)] */,
 					      WERROR *werror)
 {
 	struct wkssvc_NetrLogonDomainNameAdd r;
@@ -776,7 +776,7 @@ NTSTATUS rpccli_wkssvc_NetrLogonDomainNameAdd(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_wkssvc_NetrLogonDomainNameDel(struct rpc_pipe_client *cli,
 					      TALLOC_CTX *mem_ctx,
-					      const char *domain_name,
+					      const char *domain_name /* [in] [ref,charset(UTF16)] */,
 					      WERROR *werror)
 {
 	struct wkssvc_NetrLogonDomainNameDel r;
@@ -820,12 +820,12 @@ NTSTATUS rpccli_wkssvc_NetrLogonDomainNameDel(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_wkssvc_NetrJoinDomain(struct rpc_pipe_client *cli,
 				      TALLOC_CTX *mem_ctx,
-				      const char *server_name,
-				      const char *domain_name,
-				      const char *account_ou,
-				      const char *Account,
-				      const char *password,
-				      uint32_t join_flags,
+				      const char *server_name /* [in] [unique,charset(UTF16)] */,
+				      const char *domain_name /* [in] [ref,charset(UTF16)] */,
+				      const char *account_ou /* [in] [unique,charset(UTF16)] */,
+				      const char *Account /* [in] [unique,charset(UTF16)] */,
+				      const char *password /* [in] [unique,charset(UTF16)] */,
+				      uint32_t join_flags /* [in]  */,
 				      WERROR *werror)
 {
 	struct wkssvc_NetrJoinDomain r;
@@ -874,10 +874,10 @@ NTSTATUS rpccli_wkssvc_NetrJoinDomain(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_wkssvc_NetrUnjoinDomain(struct rpc_pipe_client *cli,
 					TALLOC_CTX *mem_ctx,
-					const char *server_name,
-					const char *Account,
-					const char *password,
-					uint32_t unjoin_flags,
+					const char *server_name /* [in] [unique,charset(UTF16)] */,
+					const char *Account /* [in] [unique,charset(UTF16)] */,
+					const char *password /* [in] [unique,charset(UTF16)] */,
+					uint32_t unjoin_flags /* [in]  */,
 					WERROR *werror)
 {
 	struct wkssvc_NetrUnjoinDomain r;
@@ -924,11 +924,11 @@ NTSTATUS rpccli_wkssvc_NetrUnjoinDomain(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_wkssvc_NetrRenameMachineInDomain(struct rpc_pipe_client *cli,
 						 TALLOC_CTX *mem_ctx,
-						 const char *server_name,
-						 const char *NewMachineName,
-						 const char *Account,
-						 const char *password,
-						 uint32_t RenameOptions,
+						 const char *server_name /* [in] [unique,charset(UTF16)] */,
+						 const char *NewMachineName /* [in] [unique,charset(UTF16)] */,
+						 const char *Account /* [in] [unique,charset(UTF16)] */,
+						 const char *password /* [in] [unique,charset(UTF16)] */,
+						 uint32_t RenameOptions /* [in]  */,
 						 WERROR *werror)
 {
 	struct wkssvc_NetrRenameMachineInDomain r;
@@ -976,11 +976,11 @@ NTSTATUS rpccli_wkssvc_NetrRenameMachineInDomain(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_wkssvc_NetrValidateName(struct rpc_pipe_client *cli,
 					TALLOC_CTX *mem_ctx,
-					const char *server_name,
-					const char *name,
-					const char *Account,
-					const char *Password,
-					enum wkssvc_NetValidateNameType name_type,
+					const char *server_name /* [in] [unique,charset(UTF16)] */,
+					const char *name /* [in] [ref,charset(UTF16)] */,
+					const char *Account /* [in] [unique,charset(UTF16)] */,
+					const char *Password /* [in] [unique,charset(UTF16)] */,
+					enum wkssvc_NetValidateNameType name_type /* [in]  */,
 					WERROR *werror)
 {
 	struct wkssvc_NetrValidateName r;
@@ -1028,9 +1028,9 @@ NTSTATUS rpccli_wkssvc_NetrValidateName(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_wkssvc_NetrGetJoinInformation(struct rpc_pipe_client *cli,
 					      TALLOC_CTX *mem_ctx,
-					      const char *server_name,
-					      const char **name_buffer,
-					      enum wkssvc_NetJoinStatus *name_type,
+					      const char *server_name /* [in] [unique,charset(UTF16)] */,
+					      const char **name_buffer /* [in,out] [ref,charset(UTF16)] */,
+					      enum wkssvc_NetJoinStatus *name_type /* [out] [ref] */,
 					      WERROR *werror)
 {
 	struct wkssvc_NetrGetJoinInformation r;
@@ -1077,12 +1077,12 @@ NTSTATUS rpccli_wkssvc_NetrGetJoinInformation(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_wkssvc_NetrGetJoinableOus(struct rpc_pipe_client *cli,
 					  TALLOC_CTX *mem_ctx,
-					  const char *server_name,
-					  const char *domain_name,
-					  const char *Account,
-					  const char *unknown,
-					  uint32_t *num_ous,
-					  const char ***ous,
+					  const char *server_name /* [in] [unique,charset(UTF16)] */,
+					  const char *domain_name /* [in] [ref,charset(UTF16)] */,
+					  const char *Account /* [in] [unique,charset(UTF16)] */,
+					  const char *unknown /* [in] [unique,charset(UTF16)] */,
+					  uint32_t *num_ous /* [in,out] [ref] */,
+					  const char ***ous /* [out] [ref,charset(UTF16),size_is(,*num_ous)] */,
 					  WERROR *werror)
 {
 	struct wkssvc_NetrGetJoinableOus r;
@@ -1132,12 +1132,12 @@ NTSTATUS rpccli_wkssvc_NetrGetJoinableOus(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_wkssvc_NetrJoinDomain2(struct rpc_pipe_client *cli,
 				       TALLOC_CTX *mem_ctx,
-				       const char *server_name,
-				       const char *domain_name,
-				       const char *account_ou,
-				       const char *admin_account,
-				       struct wkssvc_PasswordBuffer *encrypted_password,
-				       uint32_t join_flags,
+				       const char *server_name /* [in] [unique,charset(UTF16)] */,
+				       const char *domain_name /* [in] [ref,charset(UTF16)] */,
+				       const char *account_ou /* [in] [unique,charset(UTF16)] */,
+				       const char *admin_account /* [in] [unique,charset(UTF16)] */,
+				       struct wkssvc_PasswordBuffer *encrypted_password /* [in] [unique] */,
+				       uint32_t join_flags /* [in]  */,
 				       WERROR *werror)
 {
 	struct wkssvc_NetrJoinDomain2 r;
@@ -1186,10 +1186,10 @@ NTSTATUS rpccli_wkssvc_NetrJoinDomain2(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_wkssvc_NetrUnjoinDomain2(struct rpc_pipe_client *cli,
 					 TALLOC_CTX *mem_ctx,
-					 const char *server_name,
-					 const char *account,
-					 struct wkssvc_PasswordBuffer *encrypted_password,
-					 uint32_t unjoin_flags,
+					 const char *server_name /* [in] [unique,charset(UTF16)] */,
+					 const char *account /* [in] [unique,charset(UTF16)] */,
+					 struct wkssvc_PasswordBuffer *encrypted_password /* [in] [unique] */,
+					 uint32_t unjoin_flags /* [in]  */,
 					 WERROR *werror)
 {
 	struct wkssvc_NetrUnjoinDomain2 r;
@@ -1236,11 +1236,11 @@ NTSTATUS rpccli_wkssvc_NetrUnjoinDomain2(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_wkssvc_NetrRenameMachineInDomain2(struct rpc_pipe_client *cli,
 						  TALLOC_CTX *mem_ctx,
-						  const char *server_name,
-						  const char *NewMachineName,
-						  const char *Account,
-						  struct wkssvc_PasswordBuffer *EncryptedPassword,
-						  uint32_t RenameOptions,
+						  const char *server_name /* [in] [unique,charset(UTF16)] */,
+						  const char *NewMachineName /* [in] [unique,charset(UTF16)] */,
+						  const char *Account /* [in] [unique,charset(UTF16)] */,
+						  struct wkssvc_PasswordBuffer *EncryptedPassword /* [in] [unique] */,
+						  uint32_t RenameOptions /* [in]  */,
 						  WERROR *werror)
 {
 	struct wkssvc_NetrRenameMachineInDomain2 r;
@@ -1288,11 +1288,11 @@ NTSTATUS rpccli_wkssvc_NetrRenameMachineInDomain2(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_wkssvc_NetrValidateName2(struct rpc_pipe_client *cli,
 					 TALLOC_CTX *mem_ctx,
-					 const char *server_name,
-					 const char *name,
-					 const char *Account,
-					 struct wkssvc_PasswordBuffer *EncryptedPassword,
-					 enum wkssvc_NetValidateNameType name_type,
+					 const char *server_name /* [in] [unique,charset(UTF16)] */,
+					 const char *name /* [in] [ref,charset(UTF16)] */,
+					 const char *Account /* [in] [unique,charset(UTF16)] */,
+					 struct wkssvc_PasswordBuffer *EncryptedPassword /* [in] [unique] */,
+					 enum wkssvc_NetValidateNameType name_type /* [in]  */,
 					 WERROR *werror)
 {
 	struct wkssvc_NetrValidateName2 r;
@@ -1340,12 +1340,12 @@ NTSTATUS rpccli_wkssvc_NetrValidateName2(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_wkssvc_NetrGetJoinableOus2(struct rpc_pipe_client *cli,
 					   TALLOC_CTX *mem_ctx,
-					   const char *server_name,
-					   const char *domain_name,
-					   const char *Account,
-					   struct wkssvc_PasswordBuffer *EncryptedPassword,
-					   uint32_t *num_ous,
-					   const char ***ous,
+					   const char *server_name /* [in] [unique,charset(UTF16)] */,
+					   const char *domain_name /* [in] [ref,charset(UTF16)] */,
+					   const char *Account /* [in] [unique,charset(UTF16)] */,
+					   struct wkssvc_PasswordBuffer *EncryptedPassword /* [in] [unique] */,
+					   uint32_t *num_ous /* [in,out] [ref] */,
+					   const char ***ous /* [out] [ref,charset(UTF16),size_is(,*num_ous)] */,
 					   WERROR *werror)
 {
 	struct wkssvc_NetrGetJoinableOus2 r;
@@ -1395,11 +1395,11 @@ NTSTATUS rpccli_wkssvc_NetrGetJoinableOus2(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_wkssvc_NetrAddAlternateComputerName(struct rpc_pipe_client *cli,
 						    TALLOC_CTX *mem_ctx,
-						    const char *server_name,
-						    const char *NewAlternateMachineName,
-						    const char *Account,
-						    struct wkssvc_PasswordBuffer *EncryptedPassword,
-						    uint32_t Reserved,
+						    const char *server_name /* [in] [unique,charset(UTF16)] */,
+						    const char *NewAlternateMachineName /* [in] [unique,charset(UTF16)] */,
+						    const char *Account /* [in] [unique,charset(UTF16)] */,
+						    struct wkssvc_PasswordBuffer *EncryptedPassword /* [in] [unique] */,
+						    uint32_t Reserved /* [in]  */,
 						    WERROR *werror)
 {
 	struct wkssvc_NetrAddAlternateComputerName r;
@@ -1447,11 +1447,11 @@ NTSTATUS rpccli_wkssvc_NetrAddAlternateComputerName(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_wkssvc_NetrRemoveAlternateComputerName(struct rpc_pipe_client *cli,
 						       TALLOC_CTX *mem_ctx,
-						       const char *server_name,
-						       const char *AlternateMachineNameToRemove,
-						       const char *Account,
-						       struct wkssvc_PasswordBuffer *EncryptedPassword,
-						       uint32_t Reserved,
+						       const char *server_name /* [in] [unique,charset(UTF16)] */,
+						       const char *AlternateMachineNameToRemove /* [in] [unique,charset(UTF16)] */,
+						       const char *Account /* [in] [unique,charset(UTF16)] */,
+						       struct wkssvc_PasswordBuffer *EncryptedPassword /* [in] [unique] */,
+						       uint32_t Reserved /* [in]  */,
 						       WERROR *werror)
 {
 	struct wkssvc_NetrRemoveAlternateComputerName r;
@@ -1499,11 +1499,11 @@ NTSTATUS rpccli_wkssvc_NetrRemoveAlternateComputerName(struct rpc_pipe_client *c
 
 NTSTATUS rpccli_wkssvc_NetrSetPrimaryComputername(struct rpc_pipe_client *cli,
 						  TALLOC_CTX *mem_ctx,
-						  const char *server_name,
-						  const char *primary_name,
-						  const char *Account,
-						  struct wkssvc_PasswordBuffer *EncryptedPassword,
-						  uint32_t Reserved,
+						  const char *server_name /* [in] [unique,charset(UTF16)] */,
+						  const char *primary_name /* [in] [unique,charset(UTF16)] */,
+						  const char *Account /* [in] [unique,charset(UTF16)] */,
+						  struct wkssvc_PasswordBuffer *EncryptedPassword /* [in] [unique] */,
+						  uint32_t Reserved /* [in]  */,
 						  WERROR *werror)
 {
 	struct wkssvc_NetrSetPrimaryComputername r;
@@ -1551,10 +1551,10 @@ NTSTATUS rpccli_wkssvc_NetrSetPrimaryComputername(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_wkssvc_NetrEnumerateComputerNames(struct rpc_pipe_client *cli,
 						  TALLOC_CTX *mem_ctx,
-						  const char *server_name,
-						  enum wkssvc_ComputerNameType name_type,
-						  uint32_t Reserved,
-						  struct wkssvc_ComputerNamesCtr **ctr,
+						  const char *server_name /* [in] [unique,charset(UTF16)] */,
+						  enum wkssvc_ComputerNameType name_type /* [in]  */,
+						  uint32_t Reserved /* [in]  */,
+						  struct wkssvc_ComputerNamesCtr **ctr /* [out] [ref] */,
 						  WERROR *werror)
 {
 	struct wkssvc_NetrEnumerateComputerNames r;
diff --git a/source3/librpc/gen_ndr/cli_wkssvc.h b/source3/librpc/gen_ndr/cli_wkssvc.h
index 89012daf21..0d360abfeb 100644
--- a/source3/librpc/gen_ndr/cli_wkssvc.h
+++ b/source3/librpc/gen_ndr/cli_wkssvc.h
@@ -3,228 +3,228 @@
 #define __CLI_WKSSVC__
 NTSTATUS rpccli_wkssvc_NetWkstaGetInfo(struct rpc_pipe_client *cli,
 				       TALLOC_CTX *mem_ctx,
-				       const char *server_name,
-				       uint32_t level,
-				       union wkssvc_NetWkstaInfo *info,
+				       const char *server_name /* [in] [unique,charset(UTF16)] */,
+				       uint32_t level /* [in]  */,
+				       union wkssvc_NetWkstaInfo *info /* [out] [ref,switch_is(level)] */,
 				       WERROR *werror);
 NTSTATUS rpccli_wkssvc_NetWkstaSetInfo(struct rpc_pipe_client *cli,
 				       TALLOC_CTX *mem_ctx,
-				       const char *server_name,
-				       uint32_t level,
-				       union wkssvc_NetWkstaInfo *info,
-				       uint32_t *parm_error,
+				       const char *server_name /* [in] [unique,charset(UTF16)] */,
+				       uint32_t level /* [in]  */,
+				       union wkssvc_NetWkstaInfo *info /* [in] [ref,switch_is(level)] */,
+				       uint32_t *parm_error /* [in,out] [ref] */,
 				       WERROR *werror);
 NTSTATUS rpccli_wkssvc_NetWkstaEnumUsers(struct rpc_pipe_client *cli,
 					 TALLOC_CTX *mem_ctx,
-					 const char *server_name,
-					 struct wkssvc_NetWkstaEnumUsersInfo *info,
-					 uint32_t prefmaxlen,
-					 uint32_t *entries_read,
-					 uint32_t *resume_handle,
+					 const char *server_name /* [in] [unique,charset(UTF16)] */,
+					 struct wkssvc_NetWkstaEnumUsersInfo *info /* [in,out] [ref] */,
+					 uint32_t prefmaxlen /* [in]  */,
+					 uint32_t *entries_read /* [out] [ref] */,
+					 uint32_t *resume_handle /* [in,out] [unique] */,
 					 WERROR *werror);
 NTSTATUS rpccli_wkssvc_NetrWkstaUserGetInfo(struct rpc_pipe_client *cli,
 					    TALLOC_CTX *mem_ctx,
-					    const char *unknown,
-					    uint32_t level,
-					    union wkssvc_NetrWkstaUserInfo *info,
+					    const char *unknown /* [in] [unique,charset(UTF16)] */,
+					    uint32_t level /* [in]  */,
+					    union wkssvc_NetrWkstaUserInfo *info /* [out] [ref,switch_is(level)] */,
 					    WERROR *werror);
 NTSTATUS rpccli_wkssvc_NetrWkstaUserSetInfo(struct rpc_pipe_client *cli,
 					    TALLOC_CTX *mem_ctx,
-					    const char *unknown,
-					    uint32_t level,
-					    union wkssvc_NetrWkstaUserInfo *info,
-					    uint32_t *parm_err,
+					    const char *unknown /* [in] [unique,charset(UTF16)] */,
+					    uint32_t level /* [in]  */,
+					    union wkssvc_NetrWkstaUserInfo *info /* [in] [ref,switch_is(level)] */,
+					    uint32_t *parm_err /* [in,out] [unique] */,
 					    WERROR *werror);
 NTSTATUS rpccli_wkssvc_NetWkstaTransportEnum(struct rpc_pipe_client *cli,
 					     TALLOC_CTX *mem_ctx,
-					     const char *server_name,
-					     struct wkssvc_NetWkstaTransportInfo *info,
-					     uint32_t max_buffer,
-					     uint32_t *total_entries,
-					     uint32_t *resume_handle,
+					     const char *server_name /* [in] [unique,charset(UTF16)] */,
+					     struct wkssvc_NetWkstaTransportInfo *info /* [in,out] [ref] */,
+					     uint32_t max_buffer /* [in]  */,
+					     uint32_t *total_entries /* [out] [ref] */,
+					     uint32_t *resume_handle /* [in,out] [unique] */,
 					     WERROR *werror);
 NTSTATUS rpccli_wkssvc_NetrWkstaTransportAdd(struct rpc_pipe_client *cli,
 					     TALLOC_CTX *mem_ctx,
-					     const char *server_name,
-					     uint32_t level,
-					     struct wkssvc_NetWkstaTransportInfo0 *info0,
-					     uint32_t *parm_err,
+					     const char *server_name /* [in] [unique,charset(UTF16)] */,
+					     uint32_t level /* [in]  */,
+					     struct wkssvc_NetWkstaTransportInfo0 *info0 /* [in] [ref] */,
+					     uint32_t *parm_err /* [in,out] [unique] */,
 					     WERROR *werror);
 NTSTATUS rpccli_wkssvc_NetrWkstaTransportDel(struct rpc_pipe_client *cli,
 					     TALLOC_CTX *mem_ctx,
-					     const char *server_name,
-					     const char *transport_name,
-					     uint32_t unknown3,
+					     const char *server_name /* [in] [unique,charset(UTF16)] */,
+					     const char *transport_name /* [in] [unique,charset(UTF16)] */,
+					     uint32_t unknown3 /* [in]  */,
 					     WERROR *werror);
 NTSTATUS rpccli_wkssvc_NetrUseAdd(struct rpc_pipe_client *cli,
 				  TALLOC_CTX *mem_ctx,
-				  const char *server_name,
-				  uint32_t level,
-				  union wkssvc_NetrUseGetInfoCtr *ctr,
-				  uint32_t *parm_err,
+				  const char *server_name /* [in] [unique,charset(UTF16)] */,
+				  uint32_t level /* [in]  */,
+				  union wkssvc_NetrUseGetInfoCtr *ctr /* [in] [ref,switch_is(level)] */,
+				  uint32_t *parm_err /* [in,out] [unique] */,
 				  WERROR *werror);
 NTSTATUS rpccli_wkssvc_NetrUseGetInfo(struct rpc_pipe_client *cli,
 				      TALLOC_CTX *mem_ctx,
-				      const char *server_name,
-				      const char *use_name,
-				      uint32_t level,
-				      union wkssvc_NetrUseGetInfoCtr *ctr,
+				      const char *server_name /* [in] [unique,charset(UTF16)] */,
+				      const char *use_name /* [in] [ref,charset(UTF16)] */,
+				      uint32_t level /* [in]  */,
+				      union wkssvc_NetrUseGetInfoCtr *ctr /* [out] [ref,switch_is(level)] */,
 				      WERROR *werror);
 NTSTATUS rpccli_wkssvc_NetrUseDel(struct rpc_pipe_client *cli,
 				  TALLOC_CTX *mem_ctx,
-				  const char *server_name,
-				  const char *use_name,
-				  uint32_t force_cond,
+				  const char *server_name /* [in] [unique,charset(UTF16)] */,
+				  const char *use_name /* [in] [ref,charset(UTF16)] */,
+				  uint32_t force_cond /* [in]  */,
 				  WERROR *werror);
 NTSTATUS rpccli_wkssvc_NetrUseEnum(struct rpc_pipe_client *cli,
 				   TALLOC_CTX *mem_ctx,
-				   const char *server_name,
-				   struct wkssvc_NetrUseEnumInfo *info,
-				   uint32_t prefmaxlen,
-				   uint32_t *entries_read,
-				   uint32_t *resume_handle,
+				   const char *server_name /* [in] [unique,charset(UTF16)] */,
+				   struct wkssvc_NetrUseEnumInfo *info /* [in,out] [ref] */,
+				   uint32_t prefmaxlen /* [in]  */,
+				   uint32_t *entries_read /* [out] [ref] */,
+				   uint32_t *resume_handle /* [in,out] [unique] */,
 				   WERROR *werror);
 NTSTATUS rpccli_wkssvc_NetrMessageBufferSend(struct rpc_pipe_client *cli,
 					     TALLOC_CTX *mem_ctx,
-					     const char *server_name,
-					     const char *message_name,
-					     const char *message_sender_name,
-					     uint8_t *message_buffer,
-					     uint32_t message_size,
+					     const char *server_name /* [in] [unique,charset(UTF16)] */,
+					     const char *message_name /* [in] [ref,charset(UTF16)] */,
+					     const char *message_sender_name /* [in] [unique,charset(UTF16)] */,
+					     uint8_t *message_buffer /* [in] [ref,size_is(message_size)] */,
+					     uint32_t message_size /* [in]  */,
 					     WERROR *werror);
 NTSTATUS rpccli_wkssvc_NetrWorkstationStatisticsGet(struct rpc_pipe_client *cli,
 						    TALLOC_CTX *mem_ctx,
-						    const char *server_name,
-						    const char *unknown2,
-						    uint32_t unknown3,
-						    uint32_t unknown4,
-						    struct wkssvc_NetrWorkstationStatistics **info,
+						    const char *server_name /* [in] [unique,charset(UTF16)] */,
+						    const char *unknown2 /* [in] [unique,charset(UTF16)] */,
+						    uint32_t unknown3 /* [in]  */,
+						    uint32_t unknown4 /* [in]  */,
+						    struct wkssvc_NetrWorkstationStatistics **info /* [out] [ref] */,
 						    WERROR *werror);
 NTSTATUS rpccli_wkssvc_NetrLogonDomainNameAdd(struct rpc_pipe_client *cli,
 					      TALLOC_CTX *mem_ctx,
-					      const char *domain_name,
+					      const char *domain_name /* [in] [ref,charset(UTF16)] */,
 					      WERROR *werror);
 NTSTATUS rpccli_wkssvc_NetrLogonDomainNameDel(struct rpc_pipe_client *cli,
 					      TALLOC_CTX *mem_ctx,
-					      const char *domain_name,
+					      const char *domain_name /* [in] [ref,charset(UTF16)] */,
 					      WERROR *werror);
 NTSTATUS rpccli_wkssvc_NetrJoinDomain(struct rpc_pipe_client *cli,
 				      TALLOC_CTX *mem_ctx,
-				      const char *server_name,
-				      const char *domain_name,
-				      const char *account_ou,
-				      const char *Account,
-				      const char *password,
-				      uint32_t join_flags,
+				      const char *server_name /* [in] [unique,charset(UTF16)] */,
+				      const char *domain_name /* [in] [ref,charset(UTF16)] */,
+				      const char *account_ou /* [in] [unique,charset(UTF16)] */,
+				      const char *Account /* [in] [unique,charset(UTF16)] */,
+				      const char *password /* [in] [unique,charset(UTF16)] */,
+				      uint32_t join_flags /* [in]  */,
 				      WERROR *werror);
 NTSTATUS rpccli_wkssvc_NetrUnjoinDomain(struct rpc_pipe_client *cli,
 					TALLOC_CTX *mem_ctx,
-					const char *server_name,
-					const char *Account,
-					const char *password,
-					uint32_t unjoin_flags,
+					const char *server_name /* [in] [unique,charset(UTF16)] */,
+					const char *Account /* [in] [unique,charset(UTF16)] */,
+					const char *password /* [in] [unique,charset(UTF16)] */,
+					uint32_t unjoin_flags /* [in]  */,
 					WERROR *werror);
 NTSTATUS rpccli_wkssvc_NetrRenameMachineInDomain(struct rpc_pipe_client *cli,
 						 TALLOC_CTX *mem_ctx,
-						 const char *server_name,
-						 const char *NewMachineName,
-						 const char *Account,
-						 const char *password,
-						 uint32_t RenameOptions,
+						 const char *server_name /* [in] [unique,charset(UTF16)] */,
+						 const char *NewMachineName /* [in] [unique,charset(UTF16)] */,
+						 const char *Account /* [in] [unique,charset(UTF16)] */,
+						 const char *password /* [in] [unique,charset(UTF16)] */,
+						 uint32_t RenameOptions /* [in]  */,
 						 WERROR *werror);
 NTSTATUS rpccli_wkssvc_NetrValidateName(struct rpc_pipe_client *cli,
 					TALLOC_CTX *mem_ctx,
-					const char *server_name,
-					const char *name,
-					const char *Account,
-					const char *Password,
-					enum wkssvc_NetValidateNameType name_type,
+					const char *server_name /* [in] [unique,charset(UTF16)] */,
+					const char *name /* [in] [ref,charset(UTF16)] */,
+					const char *Account /* [in] [unique,charset(UTF16)] */,
+					const char *Password /* [in] [unique,charset(UTF16)] */,
+					enum wkssvc_NetValidateNameType name_type /* [in]  */,
 					WERROR *werror);
 NTSTATUS rpccli_wkssvc_NetrGetJoinInformation(struct rpc_pipe_client *cli,
 					      TALLOC_CTX *mem_ctx,
-					      const char *server_name,
-					      const char **name_buffer,
-					      enum wkssvc_NetJoinStatus *name_type,
+					      const char *server_name /* [in] [unique,charset(UTF16)] */,
+					      const char **name_buffer /* [in,out] [ref,charset(UTF16)] */,
+					      enum wkssvc_NetJoinStatus *name_type /* [out] [ref] */,
 					      WERROR *werror);
 NTSTATUS rpccli_wkssvc_NetrGetJoinableOus(struct rpc_pipe_client *cli,
 					  TALLOC_CTX *mem_ctx,
-					  const char *server_name,
-					  const char *domain_name,
-					  const char *Account,
-					  const char *unknown,
-					  uint32_t *num_ous,
-					  const char ***ous,
+					  const char *server_name /* [in] [unique,charset(UTF16)] */,
+					  const char *domain_name /* [in] [ref,charset(UTF16)] */,
+					  const char *Account /* [in] [unique,charset(UTF16)] */,
+					  const char *unknown /* [in] [unique,charset(UTF16)] */,
+					  uint32_t *num_ous /* [in,out] [ref] */,
+					  const char ***ous /* [out] [ref,charset(UTF16),size_is(,*num_ous)] */,
 					  WERROR *werror);
 NTSTATUS rpccli_wkssvc_NetrJoinDomain2(struct rpc_pipe_client *cli,
 				       TALLOC_CTX *mem_ctx,
-				       const char *server_name,
-				       const char *domain_name,
-				       const char *account_ou,
-				       const char *admin_account,
-				       struct wkssvc_PasswordBuffer *encrypted_password,
-				       uint32_t join_flags,
+				       const char *server_name /* [in] [unique,charset(UTF16)] */,
+				       const char *domain_name /* [in] [ref,charset(UTF16)] */,
+				       const char *account_ou /* [in] [unique,charset(UTF16)] */,
+				       const char *admin_account /* [in] [unique,charset(UTF16)] */,
+				       struct wkssvc_PasswordBuffer *encrypted_password /* [in] [unique] */,
+				       uint32_t join_flags /* [in]  */,
 				       WERROR *werror);
 NTSTATUS rpccli_wkssvc_NetrUnjoinDomain2(struct rpc_pipe_client *cli,
 					 TALLOC_CTX *mem_ctx,
-					 const char *server_name,
-					 const char *account,
-					 struct wkssvc_PasswordBuffer *encrypted_password,
-					 uint32_t unjoin_flags,
+					 const char *server_name /* [in] [unique,charset(UTF16)] */,
+					 const char *account /* [in] [unique,charset(UTF16)] */,
+					 struct wkssvc_PasswordBuffer *encrypted_password /* [in] [unique] */,
+					 uint32_t unjoin_flags /* [in]  */,
 					 WERROR *werror);
 NTSTATUS rpccli_wkssvc_NetrRenameMachineInDomain2(struct rpc_pipe_client *cli,
 						  TALLOC_CTX *mem_ctx,
-						  const char *server_name,
-						  const char *NewMachineName,
-						  const char *Account,
-						  struct wkssvc_PasswordBuffer *EncryptedPassword,
-						  uint32_t RenameOptions,
+						  const char *server_name /* [in] [unique,charset(UTF16)] */,
+						  const char *NewMachineName /* [in] [unique,charset(UTF16)] */,
+						  const char *Account /* [in] [unique,charset(UTF16)] */,
+						  struct wkssvc_PasswordBuffer *EncryptedPassword /* [in] [unique] */,
+						  uint32_t RenameOptions /* [in]  */,
 						  WERROR *werror);
 NTSTATUS rpccli_wkssvc_NetrValidateName2(struct rpc_pipe_client *cli,
 					 TALLOC_CTX *mem_ctx,
-					 const char *server_name,
-					 const char *name,
-					 const char *Account,
-					 struct wkssvc_PasswordBuffer *EncryptedPassword,
-					 enum wkssvc_NetValidateNameType name_type,
+					 const char *server_name /* [in] [unique,charset(UTF16)] */,
+					 const char *name /* [in] [ref,charset(UTF16)] */,
+					 const char *Account /* [in] [unique,charset(UTF16)] */,
+					 struct wkssvc_PasswordBuffer *EncryptedPassword /* [in] [unique] */,
+					 enum wkssvc_NetValidateNameType name_type /* [in]  */,
 					 WERROR *werror);
 NTSTATUS rpccli_wkssvc_NetrGetJoinableOus2(struct rpc_pipe_client *cli,
 					   TALLOC_CTX *mem_ctx,
-					   const char *server_name,
-					   const char *domain_name,
-					   const char *Account,
-					   struct wkssvc_PasswordBuffer *EncryptedPassword,
-					   uint32_t *num_ous,
-					   const char ***ous,
+					   const char *server_name /* [in] [unique,charset(UTF16)] */,
+					   const char *domain_name /* [in] [ref,charset(UTF16)] */,
+					   const char *Account /* [in] [unique,charset(UTF16)] */,
+					   struct wkssvc_PasswordBuffer *EncryptedPassword /* [in] [unique] */,
+					   uint32_t *num_ous /* [in,out] [ref] */,
+					   const char ***ous /* [out] [ref,charset(UTF16),size_is(,*num_ous)] */,
 					   WERROR *werror);
 NTSTATUS rpccli_wkssvc_NetrAddAlternateComputerName(struct rpc_pipe_client *cli,
 						    TALLOC_CTX *mem_ctx,
-						    const char *server_name,
-						    const char *NewAlternateMachineName,
-						    const char *Account,
-						    struct wkssvc_PasswordBuffer *EncryptedPassword,
-						    uint32_t Reserved,
+						    const char *server_name /* [in] [unique,charset(UTF16)] */,
+						    const char *NewAlternateMachineName /* [in] [unique,charset(UTF16)] */,
+						    const char *Account /* [in] [unique,charset(UTF16)] */,
+						    struct wkssvc_PasswordBuffer *EncryptedPassword /* [in] [unique] */,
+						    uint32_t Reserved /* [in]  */,
 						    WERROR *werror);
 NTSTATUS rpccli_wkssvc_NetrRemoveAlternateComputerName(struct rpc_pipe_client *cli,
 						       TALLOC_CTX *mem_ctx,
-						       const char *server_name,
-						       const char *AlternateMachineNameToRemove,
-						       const char *Account,
-						       struct wkssvc_PasswordBuffer *EncryptedPassword,
-						       uint32_t Reserved,
+						       const char *server_name /* [in] [unique,charset(UTF16)] */,
+						       const char *AlternateMachineNameToRemove /* [in] [unique,charset(UTF16)] */,
+						       const char *Account /* [in] [unique,charset(UTF16)] */,
+						       struct wkssvc_PasswordBuffer *EncryptedPassword /* [in] [unique] */,
+						       uint32_t Reserved /* [in]  */,
 						       WERROR *werror);
 NTSTATUS rpccli_wkssvc_NetrSetPrimaryComputername(struct rpc_pipe_client *cli,
 						  TALLOC_CTX *mem_ctx,
-						  const char *server_name,
-						  const char *primary_name,
-						  const char *Account,
-						  struct wkssvc_PasswordBuffer *EncryptedPassword,
-						  uint32_t Reserved,
+						  const char *server_name /* [in] [unique,charset(UTF16)] */,
+						  const char *primary_name /* [in] [unique,charset(UTF16)] */,
+						  const char *Account /* [in] [unique,charset(UTF16)] */,
+						  struct wkssvc_PasswordBuffer *EncryptedPassword /* [in] [unique] */,
+						  uint32_t Reserved /* [in]  */,
 						  WERROR *werror);
 NTSTATUS rpccli_wkssvc_NetrEnumerateComputerNames(struct rpc_pipe_client *cli,
 						  TALLOC_CTX *mem_ctx,
-						  const char *server_name,
-						  enum wkssvc_ComputerNameType name_type,
-						  uint32_t Reserved,
-						  struct wkssvc_ComputerNamesCtr **ctr,
+						  const char *server_name /* [in] [unique,charset(UTF16)] */,
+						  enum wkssvc_ComputerNameType name_type /* [in]  */,
+						  uint32_t Reserved /* [in]  */,
+						  struct wkssvc_ComputerNamesCtr **ctr /* [out] [ref] */,
 						  WERROR *werror);
 #endif /* __CLI_WKSSVC__ */