diff options
| author | Ralph Boehme <slow@samba.org> | 2020-10-23 17:41:33 +0200 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2020-10-23 17:44:33 +0000 |
| commit | 6da16727e119243a25072c4a2dcf211235edbc62 (patch) | |
| tree | 749b0116e3d98808e4c7ec02641ce72e588809d4 /source4 | |
| parent | d08a6b4200411114c0b9a8fa46dd6acd91d47476 (diff) | |
| download | samba-6da16727e119243a25072c4a2dcf211235edbc62.tar.gz | |
smb: rename NTCREATEX_OPTIONS_PRIVATE_DENY_DOS to NTCREATEX_FLAG_DENY_DOS
Just a shorter name, no change in behaviour.
Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/libcli/raw/smb.h | 2 | ||||
| -rw-r--r-- | source4/ntvfs/ntvfs_generic.c | 2 | ||||
| -rw-r--r-- | source4/ntvfs/posix/pvfs_open.c | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/source4/libcli/raw/smb.h b/source4/libcli/raw/smb.h index d770fa56149..a9653886fb9 100644 --- a/source4/libcli/raw/smb.h +++ b/source4/libcli/raw/smb.h @@ -184,7 +184,7 @@ * private_flags field in ntcreatex * This values have different meaning for some ntvfs backends. */ -#define NTCREATEX_OPTIONS_PRIVATE_DENY_DOS 0x0001 +#define NTCREATEX_FLAG_DENY_DOS 0x0001 #define NTCREATEX_OPTIONS_PRIVATE_DENY_FCB 0x0002 diff --git a/source4/ntvfs/ntvfs_generic.c b/source4/ntvfs/ntvfs_generic.c index a492f7e97fb..11f70a6bcc7 100644 --- a/source4/ntvfs/ntvfs_generic.c +++ b/source4/ntvfs/ntvfs_generic.c @@ -333,7 +333,7 @@ static NTSTATUS map_openx_open(uint16_t flags, uint16_t open_mode, case OPENX_MODE_DENY_DOS: /* DENY_DOS is quite strange - it depends on the filename! */ io2->generic.in.private_flags |= - NTCREATEX_OPTIONS_PRIVATE_DENY_DOS; + NTCREATEX_FLAG_DENY_DOS; if (is_exe_filename(fname)) { io2->generic.in.share_access = NTCREATEX_SHARE_ACCESS_READ | diff --git a/source4/ntvfs/posix/pvfs_open.c b/source4/ntvfs/posix/pvfs_open.c index 48d2712315f..31bd0d75b7e 100644 --- a/source4/ntvfs/posix/pvfs_open.c +++ b/source4/ntvfs/posix/pvfs_open.c @@ -1088,7 +1088,7 @@ static NTSTATUS pvfs_open_deny_dos(struct ntvfs_module_context *ntvfs, f2->ntvfs->session_info == req->session_info && f2->ntvfs->smbpid == req->smbpid && (f2->handle->private_flags & - (NTCREATEX_OPTIONS_PRIVATE_DENY_DOS | + (NTCREATEX_FLAG_DENY_DOS | NTCREATEX_OPTIONS_PRIVATE_DENY_FCB)) && (f2->access_mask & SEC_FILE_WRITE_DATA) && strcasecmp_m(f2->handle->name->original_name, @@ -1103,7 +1103,7 @@ static NTSTATUS pvfs_open_deny_dos(struct ntvfs_module_context *ntvfs, /* quite an insane set of semantics ... */ if (is_exe_filename(io->generic.in.fname) && - (f2->handle->private_flags & NTCREATEX_OPTIONS_PRIVATE_DENY_DOS)) { + (f2->handle->private_flags & NTCREATEX_FLAG_DENY_DOS)) { return NT_STATUS_SHARING_VIOLATION; } @@ -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_OPTIONS_PRIVATE_DENY_DOS | NTCREATEX_OPTIONS_PRIVATE_DENY_FCB)) { + (NTCREATEX_FLAG_DENY_DOS | NTCREATEX_OPTIONS_PRIVATE_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); |