From 1ba5077e5f1db07662f895e068c505479be29b48 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Mon, 5 Sep 2011 13:10:42 +0200 Subject: s4:ntvfs: s/== PROTOCOL_SMB2/>= PROTOCOL_SMB2_02/ metze --- source4/ntvfs/common/brlock_tdb.c | 2 +- source4/ntvfs/posix/pvfs_acl.c | 2 +- source4/ntvfs/posix/pvfs_fileinfo.c | 2 +- source4/ntvfs/posix/pvfs_open.c | 4 ++-- source4/ntvfs/posix/pvfs_qfileinfo.c | 2 +- source4/ntvfs/posix/pvfs_read.c | 2 +- source4/ntvfs/posix/pvfs_resolve.c | 2 +- source4/ntvfs/posix/pvfs_setfileinfo.c | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/source4/ntvfs/common/brlock_tdb.c b/source4/ntvfs/common/brlock_tdb.c index 817448377c..fcaa756530 100644 --- a/source4/ntvfs/common/brlock_tdb.c +++ b/source4/ntvfs/common/brlock_tdb.c @@ -242,7 +242,7 @@ static NTSTATUS brl_tdb_lock_failed(struct brl_handle *brlh, struct lock_struct */ /* in SMB2 mode always return NT_STATUS_LOCK_NOT_GRANTED! */ - if (lock->ntvfs->ctx->protocol == PROTOCOL_SMB2) { + if (lock->ntvfs->ctx->protocol >= PROTOCOL_SMB2_02) { return NT_STATUS_LOCK_NOT_GRANTED; } diff --git a/source4/ntvfs/posix/pvfs_acl.c b/source4/ntvfs/posix/pvfs_acl.c index d7a778e1f7..78169272e4 100644 --- a/source4/ntvfs/posix/pvfs_acl.c +++ b/source4/ntvfs/posix/pvfs_acl.c @@ -595,7 +595,7 @@ NTSTATUS pvfs_access_check(struct pvfs_state *pvfs, bool allow_delete = false; /* on SMB2 a blank access mask is always denied */ - if (pvfs->ntvfs->ctx->protocol == PROTOCOL_SMB2 && + if (pvfs->ntvfs->ctx->protocol >= PROTOCOL_SMB2_02 && *access_mask == 0) { return NT_STATUS_ACCESS_DENIED; } diff --git a/source4/ntvfs/posix/pvfs_fileinfo.c b/source4/ntvfs/posix/pvfs_fileinfo.c index a372383daa..b1fd55aceb 100644 --- a/source4/ntvfs/posix/pvfs_fileinfo.c +++ b/source4/ntvfs/posix/pvfs_fileinfo.c @@ -82,7 +82,7 @@ NTSTATUS pvfs_fill_dos_info(struct pvfs_state *pvfs, struct pvfs_filename *name, name->dos.alloc_size = pvfs_round_alloc_size(pvfs, name->st.st_size); name->dos.nlink = name->st.st_nlink; name->dos.ea_size = 4; - if (pvfs->ntvfs->ctx->protocol == PROTOCOL_SMB2) { + if (pvfs->ntvfs->ctx->protocol >= PROTOCOL_SMB2_02) { /* SMB2 represents a null EA with zero bytes */ name->dos.ea_size = 0; } diff --git a/source4/ntvfs/posix/pvfs_open.c b/source4/ntvfs/posix/pvfs_open.c index d56bce58f7..c0f55e8e73 100644 --- a/source4/ntvfs/posix/pvfs_open.c +++ b/source4/ntvfs/posix/pvfs_open.c @@ -1284,7 +1284,7 @@ NTSTATUS pvfs_open(struct ntvfs_module_context *ntvfs, } /* what does this bit really mean?? */ - if (req->ctx->protocol == PROTOCOL_SMB2 && + if (req->ctx->protocol >= PROTOCOL_SMB2_02 && access_mask == SEC_STD_SYNCHRONIZE) { return NT_STATUS_ACCESS_DENIED; } @@ -1502,7 +1502,7 @@ NTSTATUS pvfs_open(struct ntvfs_module_context *ntvfs, * on existing files */ if (create_options & NTCREATEX_OPTIONS_DELETE_ON_CLOSE && - req->ctx->protocol == PROTOCOL_SMB2) { + req->ctx->protocol >= PROTOCOL_SMB2_02) { del_on_close = true; } else { del_on_close = false; diff --git a/source4/ntvfs/posix/pvfs_qfileinfo.c b/source4/ntvfs/posix/pvfs_qfileinfo.c index 9284306753..ac3e6a65f5 100644 --- a/source4/ntvfs/posix/pvfs_qfileinfo.c +++ b/source4/ntvfs/posix/pvfs_qfileinfo.c @@ -222,7 +222,7 @@ static NTSTATUS pvfs_map_fileinfo(struct pvfs_state *pvfs, case RAW_FILEINFO_NAME_INFO: case RAW_FILEINFO_NAME_INFORMATION: - if (req->ctx->protocol == PROTOCOL_SMB2) { + if (req->ctx->protocol >= PROTOCOL_SMB2_02) { /* strange that SMB2 doesn't have this */ return NT_STATUS_NOT_SUPPORTED; } diff --git a/source4/ntvfs/posix/pvfs_read.c b/source4/ntvfs/posix/pvfs_read.c index d25036ad4b..34742fcf66 100644 --- a/source4/ntvfs/posix/pvfs_read.c +++ b/source4/ntvfs/posix/pvfs_read.c @@ -96,7 +96,7 @@ NTSTATUS pvfs_read(struct ntvfs_module_context *ntvfs, } /* only SMB2 honors mincnt */ - if (req->ctx->protocol == PROTOCOL_SMB2) { + if (req->ctx->protocol >= PROTOCOL_SMB2_02) { if (rd->readx.in.mincnt > ret || (ret == 0 && maxcnt > 0)) { return NT_STATUS_END_OF_FILE; diff --git a/source4/ntvfs/posix/pvfs_resolve.c b/source4/ntvfs/posix/pvfs_resolve.c index 0da64a790d..255728382e 100644 --- a/source4/ntvfs/posix/pvfs_resolve.c +++ b/source4/ntvfs/posix/pvfs_resolve.c @@ -524,7 +524,7 @@ NTSTATUS pvfs_resolve_name(struct pvfs_state *pvfs, } /* SMB2 doesn't allow a leading slash */ - if (req->ctx->protocol == PROTOCOL_SMB2 && + if (req->ctx->protocol >= PROTOCOL_SMB2_02 && *cifs_name == '\\') { return NT_STATUS_INVALID_PARAMETER; } diff --git a/source4/ntvfs/posix/pvfs_setfileinfo.c b/source4/ntvfs/posix/pvfs_setfileinfo.c index ca8e9cbe3f..92fe0148e3 100644 --- a/source4/ntvfs/posix/pvfs_setfileinfo.c +++ b/source4/ntvfs/posix/pvfs_setfileinfo.c @@ -148,7 +148,7 @@ static NTSTATUS pvfs_setfileinfo_rename(struct pvfs_state *pvfs, } /* construct the fully qualified windows name for the new file name */ - if (req->ctx->protocol == PROTOCOL_SMB2) { + if (req->ctx->protocol >= PROTOCOL_SMB2_02) { /* SMB2 sends the full path of the new name */ new_name = talloc_asprintf(req, "\\%s", info->rename_information.in.new_name); } else { -- cgit