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/smbd | |
| 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/smbd')
| -rw-r--r-- | source3/smbd/service.c | 2 | ||||
| -rw-r--r-- | source3/smbd/trans2.c | 6 | ||||
| -rw-r--r-- | source3/smbd/uid.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/source3/smbd/service.c b/source3/smbd/service.c index d395572856..675ae2b0d5 100644 --- a/source3/smbd/service.c +++ b/source3/smbd/service.c @@ -759,7 +759,7 @@ connection_struct *make_connection_snum(struct smbd_server_connection *sconn, status = find_forced_group( conn->force_user, snum, conn->server_info->unix_name, - &conn->server_info->ptok->user_sids[1], + &conn->server_info->ptok->sids[1], &conn->server_info->utok.gid); if (!NT_STATUS_IS_OK(status)) { diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c index 4ecf08a479..304476476e 100644 --- a/source3/smbd/trans2.c +++ b/source3/smbd/trans2.c @@ -3406,7 +3406,7 @@ cBytesSector=%u, cUnitTotal=%u, cUnitAvail=%d\n", (unsigned int)bsize, (unsigned for (i = 0, sid_bytes = 0; i < conn->server_info->ptok->num_sids; ++i) { sid_bytes += ndr_size_dom_sid( - &conn->server_info->ptok->user_sids[i], + &conn->server_info->ptok->sids[i], 0); } @@ -3428,11 +3428,11 @@ cBytesSector=%u, cUnitTotal=%u, cUnitAvail=%d\n", (unsigned int)bsize, (unsigned for (i = 0; i < conn->server_info->ptok->num_sids; ++i) { int sid_len = ndr_size_dom_sid( - &conn->server_info->ptok->user_sids[i], + &conn->server_info->ptok->sids[i], 0); sid_linearize(pdata + data_len, sid_len, - &conn->server_info->ptok->user_sids[i]); + &conn->server_info->ptok->sids[i]); data_len += sid_len; } diff --git a/source3/smbd/uid.c b/source3/smbd/uid.c index c7c216b66f..d7ede293c1 100644 --- a/source3/smbd/uid.c +++ b/source3/smbd/uid.c @@ -325,14 +325,14 @@ bool change_to_user(connection_struct *conn, uint16 vuid) conn->force_group_gid; gid = conn->force_group_gid; gid_to_sid(&conn->server_info->ptok - ->user_sids[1], gid); + ->sids[1], gid); break; } } } else { conn->server_info->utok.gid = conn->force_group_gid; gid = conn->force_group_gid; - gid_to_sid(&conn->server_info->ptok->user_sids[1], + gid_to_sid(&conn->server_info->ptok->sids[1], gid); } } |