diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2005-03-05 18:34:18 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:10:57 -0500 |
commit | 631aa1f0efa75924c4d8ba639de80527fb8da7b5 (patch) | |
tree | 6b6e0f16c6f5d1ec96cff1344973808c86311898 /source4/librpc/idl/samr.idl | |
parent | df036e08294ec98a2c7049f7f2fe03de1fd2ae44 (diff) | |
download | samba-631aa1f0efa75924c4d8ba639de80527fb8da7b5.tar.gz samba-631aa1f0efa75924c4d8ba639de80527fb8da7b5.tar.bz2 samba-631aa1f0efa75924c4d8ba639de80527fb8da7b5.zip |
r5661: Be a little stricter on syntax regarding arrays. A pointer to an
array can now only be :
type *name[];
rather then :
type *name;
which was supported in the past. Warnings will be given when the first
syntax is used. Reasons for this change in behaviour include improved
readability and the fact that the second format makes dealing with multiple
levels of pointers harder.
(This used to be commit a416de5825c540fd3741731c4be05e9a659a6fdb)
Diffstat (limited to 'source4/librpc/idl/samr.idl')
-rw-r--r-- | source4/librpc/idl/samr.idl | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/source4/librpc/idl/samr.idl b/source4/librpc/idl/samr.idl index bf158fadb7..85f032c414 100644 --- a/source4/librpc/idl/samr.idl +++ b/source4/librpc/idl/samr.idl @@ -99,7 +99,7 @@ typedef struct { uint32 count; - [size_is(count)] samr_SamEntry *entries; + [size_is(count)] samr_SamEntry *entries[]; } samr_SamArray; NTSTATUS samr_EnumDomains ( @@ -310,7 +310,7 @@ typedef struct { [range(0,1024)] uint32 count; - [size_is(count)] uint32 *ids; + [size_is(count)] uint32 *ids[]; } samr_Ids; NTSTATUS samr_GetAliasMembership( @@ -325,7 +325,7 @@ NTSTATUS samr_LookupNames( [in,ref] policy_handle *domain_handle, [in,range(0,1000)] uint32 num_names, - [in,ref,size_is(1000),length_is(num_names)] samr_String *names, + [in,size_is(1000),length_is(num_names)] samr_String names[], [out] samr_Ids rids, [out] samr_Ids types ); @@ -336,13 +336,13 @@ typedef struct { uint32 count; - [size_is(count)] samr_String *names; + [size_is(count)] samr_String *names[]; } samr_Strings; NTSTATUS samr_LookupRids( [in,ref] policy_handle *domain_handle, [in,range(0,1000)] uint32 num_rids, - [in,ref,size_is(1000),length_is(num_rids)] uint32 *rids, + [in,size_is(1000),length_is(num_rids)] uint32 rids[], [out] samr_Strings names, [out] samr_Ids types ); @@ -431,8 +431,8 @@ /* Function 0x19 */ typedef struct { uint32 count; - [size_is(count)] uint32 *rids; - [size_is(count)] uint32 *unknown; + [size_is(count)] uint32 *rids[]; + [size_is(count)] uint32 *unknown[]; } samr_ridArray; NTSTATUS samr_QueryGroupMember( @@ -564,7 +564,7 @@ /* this is also used in samr and netlogon */ typedef [public, flag(NDR_PAHEX)] struct { uint16 units_per_week; - [size_is(1260), length_is(units_per_week/8)] uint8 *bits; + [size_is(1260), length_is(units_per_week/8)] uint8 *bits[]; } samr_LogonHours; typedef struct { @@ -701,7 +701,7 @@ samr_String unknown2; samr_String unknown3; uint32 buf_count; - [size_is(buf_count)] uint8 *buffer; + [size_is(buf_count)] uint8 *buffer[]; uint32 rid; uint32 primary_gid; samr_AcctFlags acct_flags; @@ -819,7 +819,7 @@ typedef struct { uint32 count; - [size_is(count)] samr_RidType *rid; + [size_is(count)] samr_RidType *rid[]; } samr_RidArray; NTSTATUS samr_GetGroupsForUser( @@ -841,7 +841,7 @@ typedef struct { uint32 count; - [size_is(count)] samr_DispEntryGeneral *entries; + [size_is(count)] samr_DispEntryGeneral *entries[]; } samr_DispInfoGeneral; typedef struct { @@ -854,7 +854,7 @@ typedef struct { uint32 count; - [size_is(count)] samr_DispEntryFull *entries; + [size_is(count)] samr_DispEntryFull *entries[]; } samr_DispInfoFull; typedef struct { @@ -870,7 +870,7 @@ typedef struct { uint32 count; - [size_is(count)] samr_DispEntryAscii *entries; + [size_is(count)] samr_DispEntryAscii *entries[]; } samr_DispInfoAscii; typedef union { |