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

Guenther
(This used to be commit 492c26a9367d93802d3b6a9271dde16c49fffe69)

1 files changed, 181 insertions, 181 deletions

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;