diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-02-09 16:52:35 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2011-02-10 06:51:06 +0100 |
| commit | 2b05ba77b4e072bb1c584738cc79538166444fd3 (patch) | |
| tree | 51d3c787ac9415e049138604495bcd40b80b03f7 /source3/modules | |
| parent | d66150c14def46711a15a35b4734e8f438b6dad6 (diff) | |
| download | samba-2b05ba77b4e072bb1c584738cc79538166444fd3.tar.gz samba-2b05ba77b4e072bb1c584738cc79538166444fd3.tar.bz2 samba-2b05ba77b4e072bb1c584738cc79538166444fd3.zip | |
s3-auth Rename cryptic 'ptok' to security_token
This will allow the auth_serversupplied_info struct to be migrated
to auth_session_info easier.
Adnrew Bartlett
Signed-off-by: Andrew Tridgell <tridge@samba.org>
Diffstat (limited to 'source3/modules')
| -rw-r--r-- | source3/modules/vfs_acl_common.c | 4 | ||||
| -rw-r--r-- | source3/modules/vfs_smb_traffic_analyzer.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source3/modules/vfs_acl_common.c b/source3/modules/vfs_acl_common.c index c89ca7a806..003be02b9c 100644 --- a/source3/modules/vfs_acl_common.c +++ b/source3/modules/vfs_acl_common.c @@ -462,8 +462,8 @@ static NTSTATUS inherit_new_acl(vfs_handle_struct *handle, &psd, &size, parent_desc, - &handle->conn->server_info->ptok->sids[PRIMARY_USER_SID_INDEX], - &handle->conn->server_info->ptok->sids[PRIMARY_GROUP_SID_INDEX], + &handle->conn->server_info->security_token->sids[PRIMARY_USER_SID_INDEX], + &handle->conn->server_info->security_token->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 8cde7f42b7..6b41affb06 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->sids[0]); + &handle->conn->server_info->security_token->sids[0]); sidstr = smb_traffic_analyzer_anonymize( common_data_count_str, |