diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2010-08-31 09:32:52 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2010-08-31 10:20:14 +1000 |
| commit | 8c15cf54ae797d8f01a61228d367b5a785f06d98 (patch) | |
| tree | ab0ad383708bccfaf268cc11a3cc1121f6d8bfbc /source3/auth/auth_util.c | |
| parent | 6beb5563f3464cf32109c9069b39a5cf71134321 (diff) | |
| download | samba-8c15cf54ae797d8f01a61228d367b5a785f06d98.tar.gz samba-8c15cf54ae797d8f01a61228d367b5a785f06d98.tar.bz2 samba-8c15cf54ae797d8f01a61228d367b5a785f06d98.zip | |
s3-auth Rename NT_USER_TOKEN user_sids -> sids
This is closer to the struct security_token from security.idl
Diffstat (limited to 'source3/auth/auth_util.c')
| -rw-r--r-- | source3/auth/auth_util.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source3/auth/auth_util.c b/source3/auth/auth_util.c index 23f557a316..3b07bad6bf 100644 --- a/source3/auth/auth_util.c +++ b/source3/auth/auth_util.c @@ -405,12 +405,12 @@ static NTSTATUS log_nt_token(NT_USER_TOKEN *token) for (i=1; i<token->num_sids; i++) { group_sidstr = talloc_asprintf( frame, "%s %s", group_sidstr, - sid_string_talloc(frame, &token->user_sids[i])); + sid_string_talloc(frame, &token->sids[i])); } command = talloc_string_sub( frame, lp_log_nt_token_command(), - "%s", sid_string_talloc(frame, &token->user_sids[0])); + "%s", sid_string_talloc(frame, &token->sids[0])); command = talloc_string_sub(frame, command, "%t", group_sidstr); if (command == NULL) { @@ -477,7 +477,7 @@ NTSTATUS create_local_token(struct auth_serversupplied_info *server_info) for (i=1; i<server_info->ptok->num_sids; i++) { gid_t gid; - struct dom_sid *sid = &server_info->ptok->user_sids[i]; + struct dom_sid *sid = &server_info->ptok->sids[i]; if (!sid_to_gid(sid, &gid)) { DEBUG(10, ("Could not convert SID %s to gid, " @@ -505,13 +505,13 @@ NTSTATUS create_local_token(struct auth_serversupplied_info *server_info) uid_to_unix_users_sid(server_info->utok.uid, &tmp_sid); add_sid_to_array_unique(server_info->ptok, &tmp_sid, - &server_info->ptok->user_sids, + &server_info->ptok->sids, &server_info->ptok->num_sids); for ( i=0; i<server_info->utok.ngroups; i++ ) { gid_to_unix_groups_sid(server_info->utok.groups[i], &tmp_sid); add_sid_to_array_unique(server_info->ptok, &tmp_sid, - &server_info->ptok->user_sids, + &server_info->ptok->sids, &server_info->ptok->num_sids); } |