diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2003-01-04 08:54:43 +0000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2003-01-04 08:54:43 +0000 |
| commit | 3bc3fabee2d411947dc936372495b5f3a1498031 (patch) | |
| tree | b2e6645ace1865b238d64fbae61c337d94c68e68 /source3/rpc_server/srv_netlog_nt.c | |
| parent | c1a357ecb50efc645f1c5e5f352c96e97b4e0c66 (diff) | |
| download | samba-3bc3fabee2d411947dc936372495b5f3a1498031.tar.gz samba-3bc3fabee2d411947dc936372495b5f3a1498031.tar.bz2 samba-3bc3fabee2d411947dc936372495b5f3a1498031.zip | |
Merge from HEAD - extract user's list of SIDs from their NT_TOKEN and return
this as thier list of groups, rather than do a seperate lookup. This NT_TOKEN
is originally initgroups() (or equiv) based.
We currently send all sids in our domain, perhaps this should be further
restricted, but this works for now.
Andrew Bartlett
(This used to be commit f5850928a011211f03e5b9ece37682fd9243e2ba)
Diffstat (limited to 'source3/rpc_server/srv_netlog_nt.c')
| -rw-r--r-- | source3/rpc_server/srv_netlog_nt.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/source3/rpc_server/srv_netlog_nt.c b/source3/rpc_server/srv_netlog_nt.c index c65ea43e1e..c3d48a6527 100644 --- a/source3/rpc_server/srv_netlog_nt.c +++ b/source3/rpc_server/srv_netlog_nt.c @@ -688,16 +688,14 @@ NTSTATUS _net_sam_logon(pipes_struct *p, NET_Q_SAM_LOGON *q_u, NET_R_SAM_LOGON * pstrcpy(my_name, global_myname()); - /* - * This is the point at which we get the group - * database - we should be getting the gid_t list - * from /etc/group and then turning the uids into - * rids and then into machine sids for this user. - * JRA. - */ - - gids = NULL; - get_domain_user_groups(p->mem_ctx, &num_gids, &gids, server_info->sam_account); + if (!NT_STATUS_IS_OK(status + = nt_token_to_group_list(p->mem_ctx, + &domain_sid, + server_info->ptok, + &num_gids, + &gids))) { + return status; + } init_net_user_info3(p->mem_ctx, usr_info, user_rid, |