SMB_ASSERT(fsp->fsp_flags.is_fsa);
- if (fsp->conn->sconn->using_smb2) {
+ if (conn_using_smb2(fsp->conn->sconn)) {
notify_status = NT_STATUS_NOTIFY_CLEANUP;
} else {
notify_status = NT_STATUS_OK;
return;
}
- if (conn->sconn->using_smb2) {
+ if (conn_using_smb2(conn->sconn)) {
vuid = conn->vuid;
}
dptr->attr = attr;
- if (sconn->using_smb2) {
+ if (conn_using_smb2(sconn)) {
goto done;
}
DBG_INFO("closing dptr key %d\n", fsp->dptr->dnum);
- if (sconn != NULL && !sconn->using_smb2) {
+ if (sconn != NULL && !conn_using_smb2(sconn)) {
DLIST_REMOVE(sconn->searches.dirptrs, fsp->dptr);
/*
if (req->posix_pathnames) {
ucf_flags |= UCF_POSIX_PATHNAMES;
- if (!req->sconn->using_smb2) {
+ if (!conn_using_smb2(req->sconn)) {
ucf_flags |= UCF_LCOMP_LNK_OK;
}
}
struct messaging_context *msg_ctx;
struct dcesrv_context *dce_ctx;
struct notify_context *notify_ctx;
- bool using_smb2;
int trans_num;
size_t num_users;
* According to Samba4, SEC_FILE_READ_ATTRIBUTE is always granted,
* but we don't have to store this - just ignore it on access check.
*/
- if (conn->sconn->using_smb2) {
+ if (conn_using_smb2(conn->sconn)) {
/*
* SMB2 doesn't return it (according to Microsoft tests).
* Test Case: TestSuite_ScenarioNo009GrantedAccessTestS0
goto fail;
}
- if (conn->sconn->using_smb2 &&
+ if (conn_using_smb2(conn->sconn) &&
(access_mask == SEC_FLAG_SYSTEM_SECURITY))
{
/*
enum remote_arch_types ra_type;
SMB_ASSERT(conn != NULL);
- SMB_ASSERT(!conn->sconn->using_smb2);
+ SMB_ASSERT(!conn_using_smb2(conn->sconn));
snum = SNUM(conn);
struct smbXsrv_connection *xconn = NULL;
bool ret;
- if (sconn->using_smb2) {
+ if (conn_using_smb2(sconn)) {
/* Don't do keepalives on an SMB2 connection. */
return false;
}
SIVAL(outbody.data, 0x3C,
out_negotiate_context_offset); /* reserved/NegotiateContextOffset */
- req->sconn->using_smb2 = true;
-
if (dialect == SMB2_DIALECT_REVISION_2FF) {
return smbd_smb2_request_done(req, outbody, &outdyn);
}
* MS NFS style mode entry coming in on a POSIX
* handle over SMB2+.
*/
- if (!fsp->conn->sconn->using_smb2) {
+ if (!conn_using_smb2(fsp->conn->sconn)) {
return false;
}
}
#if defined(WITH_SMB1SERVER)
- if (sconn->using_smb2) {
+ if (conn_using_smb2(sconn)) {
#endif
send_break_message_smb2(fsp, break_from, break_to);
#if defined(WITH_SMB1SERVER)
}
#if defined(WITH_SMB1SERVER)
- if (sconn->using_smb2) {
+ if (conn_using_smb2(sconn)) {
#endif
send_break_message_smb2(fsp, 0, OPLOCKLEVEL_NONE);
#if defined(WITH_SMB1SERVER)
struct smbd_server_connection *sconn = xconn->client->sconn;
struct pending_message_list *pml;
- if (sconn->using_smb2) {
+ if (conn_using_smb2(sconn)) {
remove_deferred_open_message_smb2(xconn, mid);
return;
}
struct pending_message_list *pml;
int i = 0;
- if (sconn->using_smb2) {
+ if (conn_using_smb2(sconn)) {
return schedule_deferred_open_message_smb2(xconn, mid);
}
struct smbd_server_connection *sconn = xconn->client->sconn;
struct pending_message_list *pml;
- if (sconn->using_smb2) {
+ if (conn_using_smb2(sconn)) {
return open_was_deferred_smb2(xconn, mid);
}
{
struct pending_message_list *pml;
- if (smbreq->sconn->using_smb2) {
+ if (conn_using_smb2(smbreq->sconn)) {
return get_deferred_open_message_state_smb2(smbreq->smb2req,
p_request_time,
open_rec);
tsocket_address_string(conn->sconn->remote_address,
talloc_tos()) );
#if defined(WITH_SMB1SERVER)
- if (sconn->using_smb2) {
+ if (conn_using_smb2(sconn)) {
#endif
signing_active = smb2_signing_key_valid(
session->global->encryption_key);
&total_ea_len,
&ea_list);
- if(fsp->conn->sconn->using_smb2) {
+ if(conn_using_smb2(fsp->conn->sconn)) {
unsigned int ret_data_size;
/*
* We're going to be using fill_ea_chained_buffer() to
DBG_DEBUG("SMB2_FILE_POSIX_INFORMATION\n");
- if (!(conn->sconn->using_smb2)) {
+ if (!conn_using_smb2(conn->sconn)) {
return NT_STATUS_INVALID_LEVEL;
}
struct files_struct *fsp,
uint16_t info_level)
{
- if (conn->sconn->using_smb2 &&
+ if (conn_using_smb2(conn->sconn) &&
fsp->posix_flags == FSP_POSIX_FLAGS_OPEN &&
info_level == SMB2_FS_POSIX_INFORMATION_INTERNAL)
{
ok = true;
}
- if (conn->sconn->using_smb2 &&
+ if (conn_using_smb2(conn->sconn) &&
(fsp->posix_flags & FSP_POSIX_FLAGS_OPEN))
{
DBG_DEBUG("SMB2 posix open\n");
{
char *nfname = NULL;
- if (fsp == NULL || !fsp->conn->sconn->using_smb2) {
+ if (fsp == NULL ||
+ !conn_using_smb2(fsp->conn->sconn)) {
return NT_STATUS_INVALID_LEVEL;
}
};
enum ndr_err_code ndr_err;
- if (!(conn->sconn->using_smb2)) {
+ if (!conn_using_smb2(conn->sconn)) {
return NT_STATUS_INVALID_LEVEL;
}
if (fsp == NULL) {
case SMB_FILE_LINK_INFORMATION:
{
- if (conn->sconn->using_smb2) {
+ if (conn_using_smb2(conn->sconn)) {
status = smb2_file_link_information(conn,
req,
pdata,