summaryrefslogtreecommitdiff
path: root/source3/modules
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2010-08-31 09:32:52 +1000
committerAndrew Bartlett <abartlet@samba.org>2010-08-31 10:20:14 +1000
commit8c15cf54ae797d8f01a61228d367b5a785f06d98 (patch)
treeab0ad383708bccfaf268cc11a3cc1121f6d8bfbc /source3/modules
parent6beb5563f3464cf32109c9069b39a5cf71134321 (diff)
downloadsamba-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/modules')
-rw-r--r--source3/modules/vfs_acl_common.c4
-rw-r--r--source3/modules/vfs_smb_traffic_analyzer.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/source3/modules/vfs_acl_common.c b/source3/modules/vfs_acl_common.c
index 46ff2e6f0c..e759dc2df3 100644
--- a/source3/modules/vfs_acl_common.c
+++ b/source3/modules/vfs_acl_common.c
@@ -422,8 +422,8 @@ static NTSTATUS inherit_new_acl(vfs_handle_struct *handle,
&psd,
&size,
parent_desc,
- &handle->conn->server_info->ptok->user_sids[PRIMARY_USER_SID_INDEX],
- &handle->conn->server_info->ptok->user_sids[PRIMARY_GROUP_SID_INDEX],
+ &handle->conn->server_info->ptok->sids[PRIMARY_USER_SID_INDEX],
+ &handle->conn->server_info->ptok->sids[PRIMARY_GROUP_SID_INDEX],
is_directory);
if (!NT_STATUS_IS_OK(status)) {
return status;
diff --git a/source3/modules/vfs_smb_traffic_analyzer.c b/source3/modules/vfs_smb_traffic_analyzer.c
index 53ea5f9339..a5e1f5e6f6 100644
--- a/source3/modules/vfs_smb_traffic_analyzer.c
+++ b/source3/modules/vfs_smb_traffic_analyzer.c
@@ -330,7 +330,7 @@ static char *smb_traffic_analyzer_create_string( TALLOC_CTX *ctx,
* anonymized if needed, by the calling function.
*/
usersid = dom_sid_string( common_data_count_str,
- &handle->conn->server_info->ptok->user_sids[0]);
+ &handle->conn->server_info->ptok->sids[0]);
sidstr = smb_traffic_analyzer_anonymize(
common_data_count_str,