diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-02-21 16:11:13 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-02-21 16:11:13 +0100 |
| commit | 10e7f9f02d3b952c924e7c98ce01d27cc6baac84 (patch) | |
| tree | cdc3655b8ebf084031aa84c4967333d176994315 /source4/librpc | |
| parent | 426e7fef1f080f22a10e89cebae58a40db8bc77f (diff) | |
| parent | 141f4b8f838f750b979eeef11743244008bfa339 (diff) | |
| download | samba-10e7f9f02d3b952c924e7c98ce01d27cc6baac84.tar.gz samba-10e7f9f02d3b952c924e7c98ce01d27cc6baac84.tar.bz2 samba-10e7f9f02d3b952c924e7c98ce01d27cc6baac84.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial
(This used to be commit 52a8d06f00ab3900e2186e047902dbcbe3138a01)
Diffstat (limited to 'source4/librpc')
| -rw-r--r-- | source4/librpc/idl/samr.idl | 2 | ||||
| -rw-r--r-- | source4/librpc/idl/srvsvc.idl | 11 |
2 files changed, 11 insertions, 2 deletions
diff --git a/source4/librpc/idl/samr.idl b/source4/librpc/idl/samr.idl index 2dc33fa9b9..3a11ab752c 100644 --- a/source4/librpc/idl/samr.idl +++ b/source4/librpc/idl/samr.idl @@ -960,7 +960,7 @@ import "misc.idl", "lsa.idl", "security.idl"; typedef struct { uint32 idx; - lsa_AsciiString account_name; + lsa_AsciiStringLarge account_name; } samr_DispEntryAscii; typedef struct { diff --git a/source4/librpc/idl/srvsvc.idl b/source4/librpc/idl/srvsvc.idl index 66c52fa43f..8ef49413bc 100644 --- a/source4/librpc/idl/srvsvc.idl +++ b/source4/librpc/idl/srvsvc.idl @@ -1127,7 +1127,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 { |