sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-07 09:49:30 +03:00
Code Activity

r4946: Our notion the other_sids in the info3 SamLogon struct was

Browse Source 
...hmmm... completely bogus. This does not affect us as a domain controller,
as we never set other_sids, but I have *no* idea how winbind got away with it.

Please review thoroughly, samba4 idl looks closer to reality here.

Test case: Member of w2k3 domain, authenticate as a user who is member of one
or more domain local groups. Easiest review with 'client schannel = no'.

Thanks,

Volker
(This used to be commit a0a6388830)
This commit is contained in:
Volker Lendecke
2005-01-23 14:10:57 +00:00
committed by Gerald (Jerry) Carter
parent f6fed0082b
commit fcfc94a66a
2 changed files with 34 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source3/include/rpc_netlogon.h
View File

@ -190,9 +190,8 @@ typedef struct net_user_info_3
DOM_SID2 dom_sid; /* domain SID */
uint32 num_other_groups; /* other groups */
DOM_GID *other_gids; /* group info */
DOM_SID2 *other_sids; /* foreign/trusted domain SIDs */
uint32 *other_sids_attrib;
} NET_USER_INFO_3;

45
source3/rpc_parse/parse_net.c
View File

@ -1646,31 +1646,52 @@ BOOL net_io_user_info3(const char *desc, NET_USER_INFO_3 *usr, prs_struct *ps,
if(!smb_io_dom_sid2("", &usr->dom_sid, ps, depth)) /* domain SID */
return False;
if (usr->num_other_sids) {
if (usr->buffer_other_sids) {
uint32 num_other_sids = usr->num_other_sids;
if (!prs_uint32("num_other_sids", ps, depth,
&num_other_sids))
return False;
if (num_other_sids != usr->num_other_sids)
return False;
if (UNMARSHALLING(ps)) {
usr->other_sids = PRS_ALLOC_MEM(ps, DOM_SID2, usr->num_other_sids);
if (usr->other_sids == NULL)
usr->other_sids_attrib =
PRS_ALLOC_MEM(ps, uint32, usr->num_other_sids);
if ((num_other_sids != 0) &&
((usr->other_sids == NULL) ||
(usr->other_sids_attrib == NULL)))
return False;
}
if(!prs_uint32("num_other_groups", ps, depth, &usr->num_other_groups))
return False;
if (UNMARSHALLING(ps) && usr->num_other_groups > 0) {
usr->other_gids = PRS_ALLOC_MEM(ps, DOM_GID, usr->num_other_groups);
if (usr->other_gids == NULL)
/* First the pointers to the SIDS and attributes */
depth++;
for (i=0; i<usr->num_other_sids; i++) {
uint32 ptr = 1;
if (!prs_uint32("sid_ptr", ps, depth, &ptr))
return False;
if (UNMARSHALLING(ps) && (ptr == 0))
return False;
if (!prs_uint32("attribute", ps, depth,
&usr->other_sids_attrib[i]))
return False;
}
for (i = 0; i < usr->num_other_groups; i++) {
if(!smb_io_gid("", &usr->other_gids[i], ps, depth)) /* other GIDs */
return False;
}
for (i = 0; i < usr->num_other_sids; i++) {
if(!smb_io_dom_sid2("", &usr->other_sids[i], ps, depth)) /* other domain SIDs */
return False;
}
depth--;
}
return True;