summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2008-10-30 11:07:24 +0100
committerGünther Deschner <gd@samba.org>2008-10-31 02:44:27 +0100
commitca4cd04bed7b45c9ed00f23b1af4259eb7a4afd9 (patch)
tree8b51a30f61c6d2e95dc6f471b2dd2ca0b235acb7
parent8c1a90c2e319270cb2cab7ed995a61a9902c884d (diff)
downloadsamba-ca4cd04bed7b45c9ed00f23b1af4259eb7a4afd9.tar.gz
samba-ca4cd04bed7b45c9ed00f23b1af4259eb7a4afd9.tar.bz2
samba-ca4cd04bed7b45c9ed00f23b1af4259eb7a4afd9.zip
s3-srvsvc-idl: merge STR_LEN4 removal from s4.
Guenther
-rw-r--r--source3/librpc/idl/srvsvc.idl11
1 files changed, 10 insertions, 1 deletions
diff --git a/source3/librpc/idl/srvsvc.idl b/source3/librpc/idl/srvsvc.idl
index 39d72b73da..021b0e8d87 100644
--- a/source3/librpc/idl/srvsvc.idl
+++ b/source3/librpc/idl/srvsvc.idl
@@ -1142,7 +1142,16 @@ import "security.idl", "svcctl.idl";
/* srvsvc_NetDisk */
/**************************/
typedef struct {
- [flag(STR_LEN4)] string disk;
+ /*
+ * In theory this should be:
+ * [charset(UTF16),string] uint16 annotation[3]
+ * But midl treats this as:
+ * [charset(UTF16),string] uint16 annotation[]
+ * and pidl doesn't support this yet
+ */
+ [value(0)] uint32 __disk_offset;
+ [value(strlen(disk)+1)] uint32 __disk_length;
+ [charset(UTF16)] uint16 disk[__disk_length];
} srvsvc_NetDiskInfo0;
typedef struct {