diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2005-05-01 08:05:17 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:16:24 -0500 |
| commit | bb6e2059ee0b07d15ef3f924a137321d5fd6aa0f (patch) | |
| tree | 44a80422a0b93012d5908b4839a097c2de22a628 /source4/librpc | |
| parent | 14b73135430d7636e418746529ba2d38f8e9de6f (diff) | |
| download | samba-bb6e2059ee0b07d15ef3f924a137321d5fd6aa0f.tar.gz samba-bb6e2059ee0b07d15ef3f924a137321d5fd6aa0f.tar.bz2 samba-bb6e2059ee0b07d15ef3f924a137321d5fd6aa0f.zip | |
r6544: Use common structures between SAMR, NETLGON and the Krb5 PAC.
Fill out the group list for the SamLogon reply, so clients get the
supplementary groups.
Andrew Bartlett
(This used to be commit d9c31e60a72c345e3a23a7eb742906bcfc18721c)
Diffstat (limited to 'source4/librpc')
| -rw-r--r-- | source4/librpc/idl/krb5pac.idl | 3 | ||||
| -rw-r--r-- | source4/librpc/idl/netlogon.idl | 3 | ||||
| -rw-r--r-- | source4/librpc/idl/samr.idl | 18 |
3 files changed, 11 insertions, 13 deletions
diff --git a/source4/librpc/idl/krb5pac.idl b/source4/librpc/idl/krb5pac.idl index c5b64993f0..a8a0ca0697 100644 --- a/source4/librpc/idl/krb5pac.idl +++ b/source4/librpc/idl/krb5pac.idl @@ -26,8 +26,7 @@ interface krb5pac uint32 unknown[5]; netr_SamInfo3 info3; dom_sid2 *res_group_dom_sid; - uint32 res_groups_count; - [size_is(res_groups_count)] netr_GroupMembership *res_groups[]; + samr_RidWithTypeArray res_groups; } PAC_LOGON_INFO; const uint8 PAC_TYPE_LOGON_INFO = 1; diff --git a/source4/librpc/idl/netlogon.idl b/source4/librpc/idl/netlogon.idl index c97a640d18..0e601b372a 100644 --- a/source4/librpc/idl/netlogon.idl +++ b/source4/librpc/idl/netlogon.idl @@ -156,8 +156,7 @@ interface netlogon uint16 bad_password_count; uint32 rid; uint32 primary_gid; - uint32 group_count; - [size_is(group_count)] netr_GroupMembership *groupids[]; + samr_RidWithTypeArray groups; uint32 user_flags; netr_UserSessionKey key; netr_String logon_server; diff --git a/source4/librpc/idl/samr.idl b/source4/librpc/idl/samr.idl index 0a94756868..3cf2aeaf7e 100644 --- a/source4/librpc/idl/samr.idl +++ b/source4/librpc/idl/samr.idl @@ -432,12 +432,12 @@ typedef struct { uint32 count; [size_is(count)] uint32 *rids[]; - [size_is(count)] uint32 *unknown[]; - } samr_ridArray; + [size_is(count)] uint32 *types[]; + } samr_RidTypeArray; NTSTATUS samr_QueryGroupMember( [in,ref] policy_handle *group_handle, - [out] samr_ridArray *rids + [out] samr_RidTypeArray *rids ); @@ -813,19 +813,19 @@ /************************/ /* Function 0x27 */ - typedef struct { + typedef [public] struct { uint32 rid; uint32 type; - } samr_RidType; + } samr_RidWithType; - typedef struct { + typedef [public] struct { uint32 count; - [size_is(count)] samr_RidType *rid[]; - } samr_RidArray; + [size_is(count)] samr_RidWithType *rids[]; + } samr_RidWithTypeArray; NTSTATUS samr_GetGroupsForUser( [in,ref] policy_handle *user_handle, - [out] samr_RidArray *rids + [out] samr_RidWithTypeArray *rids ); /************************/ |