diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2005-10-16 23:47:09 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:44:50 -0500 |
commit | f598135c6b3dabd1435ea7eed5d8ab69dac97407 (patch) | |
tree | 26fe2a0c291715762b9eb55772866bd57b530c5e /source4/librpc/idl | |
parent | dc36f294762c0821542ad4b777e4295230ba03b9 (diff) | |
download | samba-f598135c6b3dabd1435ea7eed5d8ab69dac97407.tar.gz samba-f598135c6b3dabd1435ea7eed5d8ab69dac97407.tar.bz2 samba-f598135c6b3dabd1435ea7eed5d8ab69dac97407.zip |
r11105: Warn if conformant arrays are not at the end of a struct
Support conformant [string] arrays
Eliminate utf8string
This breaks xattr binary compatibility with previous versions - is that a
problem?
(This used to be commit 7596c708ba6642473319a1b699a5a910a639e50d)
Diffstat (limited to 'source4/librpc/idl')
-rw-r--r-- | source4/librpc/idl/drsuapi.idl | 2 | ||||
-rw-r--r-- | source4/librpc/idl/unixinfo.idl | 8 | ||||
-rw-r--r-- | source4/librpc/idl/xattr.idl | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/source4/librpc/idl/drsuapi.idl b/source4/librpc/idl/drsuapi.idl index f900af9ce2..9711674581 100644 --- a/source4/librpc/idl/drsuapi.idl +++ b/source4/librpc/idl/drsuapi.idl @@ -430,7 +430,7 @@ interface drsuapi /* UnicodeString values */ typedef struct { [range(0,10485760)] uint32 length; - [subcontext(4)] nstring *string; + [size_is(length),charset(UTF16)] uint16 *string; } drsuapi_DsAttributeValueUnicodeString; typedef struct { diff --git a/source4/librpc/idl/unixinfo.idl b/source4/librpc/idl/unixinfo.idl index e740368875..ac75430532 100644 --- a/source4/librpc/idl/unixinfo.idl +++ b/source4/librpc/idl/unixinfo.idl @@ -40,10 +40,10 @@ [out] dom_sid *sid ); - typedef struct { - NTSTATUS status; - utf8string homedir; - utf8string shell; + typedef struct { + NTSTATUS status; + [string,charset(UTF8)] uint8 *homedir; + [string,charset(UTF8)] uint8 *shell; } unixinfo_GetPWUidInfo; /******************/ diff --git a/source4/librpc/idl/xattr.idl b/source4/librpc/idl/xattr.idl index 48d0c76183..4cb1f75393 100644 --- a/source4/librpc/idl/xattr.idl +++ b/source4/librpc/idl/xattr.idl @@ -41,7 +41,7 @@ interface xattr NTTIME create_time; NTTIME change_time; NTTIME write_time; /* only used when sticky write time is set */ - utf8string name; /* will be used for case-insensitive speedup */ + [string,charset(UTF8)] uint8 *name; /* will be used for case-insensitive speedup */ } xattr_DosInfo2; typedef [switch_type(uint16)] union { @@ -59,7 +59,7 @@ interface xattr const char *XATTR_DOSEAS_NAME = "user.DosEAs"; typedef struct { - utf8string name; + [string,charset(UTF8)] uint8 *name; DATA_BLOB value; } xattr_EA; @@ -85,7 +85,7 @@ interface xattr uint32 flags; udlong size; udlong alloc_size; - utf8string name; + [charset(UTF8),string] uint8 name[]; } xattr_DosStream; typedef [public] struct { |