sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-05 20:58:40 +03:00
Code

smb: rename NTCREATEX_OPTIONS_PRIVATE_DENY_FCB to NTCREATEX_FLAG_DENY_FCB

Browse Source 
Just a shorter name, no change in behaviour.

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Ralph Boehme 2020-10-23 17:42:28 +02:00 committed by Jeremy Allison
parent 6da16727e1
commit c2f0fd40da
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source3/include/smb.h
View File

@ -406,7 +406,7 @@ Offset Data length.
* argument.
*/
#define NTCREATEX_FLAG_DENY_DOS 0x0001
#define NTCREATEX_OPTIONS_PRIVATE_DENY_FCB 0x0002
#define NTCREATEX_FLAG_DENY_FCB 0x0002
/* Private options for printer support */
#define NTCREATEX_OPTIONS_PRIVATE_DELETE_ON_CLOSE 0x0008

4
source3/lib/util.c
View File

@ -1724,7 +1724,7 @@ uint32_t map_share_mode_to_deny_mode(uint32_t share_access, uint32_t private_opt
}
if (private_options & NTCREATEX_FLAG_DENY_DOS) {
return DENY_DOS;
} else if (private_options & NTCREATEX_OPTIONS_PRIVATE_DENY_FCB) {
} else if (private_options & NTCREATEX_FLAG_DENY_FCB) {
return DENY_FCB;
}
@ -2051,7 +2051,7 @@ bool map_open_params_to_ntcreate(const char *smb_base_fname,
break;
case DENY_FCB:
private_flags |= NTCREATEX_OPTIONS_PRIVATE_DENY_FCB;
private_flags |= NTCREATEX_FLAG_DENY_FCB;
share_mode = FILE_SHARE_NONE;
break;

4
source3/smbd/smb1_utils.c
View File

@ -43,7 +43,7 @@ struct files_struct *fcb_or_dos_open(
if ((private_flags &
(NTCREATEX_FLAG_DENY_DOS|
NTCREATEX_OPTIONS_PRIVATE_DENY_FCB))
NTCREATEX_FLAG_DENY_FCB))
== 0) {
return NULL;
}
@ -68,7 +68,7 @@ struct files_struct *fcb_or_dos_open(
fsp->file_pid == req->smbpid &&
(fsp->fh->private_options &
(NTCREATEX_FLAG_DENY_DOS |
NTCREATEX_OPTIONS_PRIVATE_DENY_FCB)) &&
NTCREATEX_FLAG_DENY_FCB)) &&
(fsp->access_mask & FILE_WRITE_DATA) &&
strequal(fsp->fsp_name->base_name, smb_fname->base_name) &&
strequal(fsp->fsp_name->stream_name,

2
source4/libcli/raw/smb.h
View File

@ -185,7 +185,7 @@
* This values have different meaning for some ntvfs backends.
*/
#define NTCREATEX_FLAG_DENY_DOS 0x0001
#define NTCREATEX_OPTIONS_PRIVATE_DENY_FCB 0x0002
#define NTCREATEX_FLAG_DENY_FCB 0x0002
/* ntcreatex impersonation field */

2
source4/ntvfs/ntvfs_generic.c
View File

@ -347,7 +347,7 @@ static NTSTATUS map_openx_open(uint16_t flags, uint16_t open_mode,
}
break;
case OPENX_MODE_DENY_FCB:
io2->generic.in.private_flags |= NTCREATEX_OPTIONS_PRIVATE_DENY_FCB;
io2->generic.in.private_flags |= NTCREATEX_FLAG_DENY_FCB;
io2->generic.in.share_access = NTCREATEX_SHARE_ACCESS_NONE;
break;
default:

4
source4/ntvfs/posix/pvfs_open.c
View File

@ -1089,7 +1089,7 @@ static NTSTATUS pvfs_open_deny_dos(struct ntvfs_module_context *ntvfs,
f2->ntvfs->smbpid == req->smbpid &&
(f2->handle->private_flags &
(NTCREATEX_FLAG_DENY_DOS |
NTCREATEX_OPTIONS_PRIVATE_DENY_FCB)) &&
NTCREATEX_FLAG_DENY_FCB)) &&
(f2->access_mask & SEC_FILE_WRITE_DATA) &&
strcasecmp_m(f2->handle->name->original_name,
io->generic.in.fname)==0) {
@ -1156,7 +1156,7 @@ static NTSTATUS pvfs_open_setup_retry(struct ntvfs_module_context *ntvfs,
struct timeval *final_timeout = NULL;
if (io->generic.in.private_flags &
(NTCREATEX_FLAG_DENY_DOS | NTCREATEX_OPTIONS_PRIVATE_DENY_FCB)) {
(NTCREATEX_FLAG_DENY_DOS | NTCREATEX_FLAG_DENY_FCB)) {
/* see if we can satisfy the request using the special DENY_DOS
code */
status = pvfs_open_deny_dos(ntvfs, req, io, f, lck);