diff options
Diffstat (limited to 'source3/smbd/trans2.c')
| -rw-r--r-- | source3/smbd/trans2.c | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c index 32c557826e..12cbc3b9e9 100644 --- a/source3/smbd/trans2.c +++ b/source3/smbd/trans2.c @@ -3199,11 +3199,11 @@ cBytesSector=%u, cUnitTotal=%u, cUnitAvail=%d\n", (unsigned int)bsize, (unsigned fsp.fnum = -1; /* access check */ - if (conn->server_info->utok.uid != sec_initial_uid()) { + if (conn->session_info->utok.uid != sec_initial_uid()) { DEBUG(0,("set_user_quota: access_denied " "service [%s] user [%s]\n", lp_servicename(SNUM(conn)), - conn->server_info->unix_name)); + conn->session_info->unix_name)); return NT_STATUS_ACCESS_DENIED; } @@ -3356,7 +3356,7 @@ cBytesSector=%u, cUnitTotal=%u, cUnitAvail=%d\n", (unsigned int)bsize, (unsigned * in our list of SIDs. */ if (nt_token_check_sid(&global_sid_Builtin_Guests, - conn->server_info->security_token)) { + conn->session_info->security_token)) { flags |= SMB_WHOAMI_GUEST; } @@ -3364,7 +3364,7 @@ cBytesSector=%u, cUnitTotal=%u, cUnitAvail=%d\n", (unsigned int)bsize, (unsigned * is in our list of SIDs. */ if (nt_token_check_sid(&global_sid_Authenticated_Users, - conn->server_info->security_token)) { + conn->session_info->security_token)) { flags &= ~SMB_WHOAMI_GUEST; } @@ -3380,18 +3380,18 @@ cBytesSector=%u, cUnitTotal=%u, cUnitAvail=%d\n", (unsigned int)bsize, (unsigned + 4 /* num_sids */ + 4 /* SID bytes */ + 4 /* pad/reserved */ - + (conn->server_info->utok.ngroups * 8) + + (conn->session_info->utok.ngroups * 8) /* groups list */ - + (conn->server_info->security_token->num_sids * + + (conn->session_info->security_token->num_sids * SID_MAX_SIZE) /* SID list */; SIVAL(pdata, 0, flags); SIVAL(pdata, 4, SMB_WHOAMI_MASK); SBIG_UINT(pdata, 8, - (uint64_t)conn->server_info->utok.uid); + (uint64_t)conn->session_info->utok.uid); SBIG_UINT(pdata, 16, - (uint64_t)conn->server_info->utok.gid); + (uint64_t)conn->session_info->utok.gid); if (data_len >= max_data_bytes) { @@ -3406,17 +3406,17 @@ cBytesSector=%u, cUnitTotal=%u, cUnitAvail=%d\n", (unsigned int)bsize, (unsigned break; } - SIVAL(pdata, 24, conn->server_info->utok.ngroups); - SIVAL(pdata, 28, conn->server_info->security_token->num_sids); + SIVAL(pdata, 24, conn->session_info->utok.ngroups); + SIVAL(pdata, 28, conn->session_info->security_token->num_sids); /* We walk the SID list twice, but this call is fairly * infrequent, and I don't expect that it's performance * sensitive -- jpeach */ for (i = 0, sid_bytes = 0; - i < conn->server_info->security_token->num_sids; ++i) { + i < conn->session_info->security_token->num_sids; ++i) { sid_bytes += ndr_size_dom_sid( - &conn->server_info->security_token->sids[i], + &conn->session_info->security_token->sids[i], 0); } @@ -3428,21 +3428,21 @@ cBytesSector=%u, cUnitTotal=%u, cUnitAvail=%d\n", (unsigned int)bsize, (unsigned data_len = 40; /* GID list */ - for (i = 0; i < conn->server_info->utok.ngroups; ++i) { + for (i = 0; i < conn->session_info->utok.ngroups; ++i) { SBIG_UINT(pdata, data_len, - (uint64_t)conn->server_info->utok.groups[i]); + (uint64_t)conn->session_info->utok.groups[i]); data_len += 8; } /* SID list */ for (i = 0; - i < conn->server_info->security_token->num_sids; ++i) { + i < conn->session_info->security_token->num_sids; ++i) { int sid_len = ndr_size_dom_sid( - &conn->server_info->security_token->sids[i], + &conn->session_info->security_token->sids[i], 0); sid_linearize(pdata + data_len, sid_len, - &conn->server_info->security_token->sids[i]); + &conn->session_info->security_token->sids[i]); data_len += sid_len; } @@ -3694,11 +3694,11 @@ cap_low = 0x%x, cap_high = 0x%x\n", ZERO_STRUCT(quotas); /* access check */ - if ((conn->server_info->utok.uid != sec_initial_uid()) + if ((conn->session_info->utok.uid != sec_initial_uid()) ||!CAN_WRITE(conn)) { DEBUG(0,("set_user_quota: access_denied service [%s] user [%s]\n", lp_servicename(SNUM(conn)), - conn->server_info->unix_name)); + conn->session_info->unix_name)); reply_nterror(req, NT_STATUS_ACCESS_DENIED); return; } @@ -5838,7 +5838,7 @@ static NTSTATUS smb_set_file_disposition_info(connection_struct *conn, /* The set is across all open files on this dev/inode pair. */ if (!set_delete_on_close(fsp, delete_on_close, - &conn->server_info->utok)) { + &conn->session_info->utok)) { return NT_STATUS_ACCESS_DENIED; } return NT_STATUS_OK; |