diff options
| -rw-r--r-- | source3/include/smb.h | 2 | ||||
| -rw-r--r-- | source3/lib/util.c | 4 | ||||
| -rw-r--r-- | source3/smbd/open.c | 2 | ||||
| -rw-r--r-- | source3/smbd/smb1_utils.c | 6 | ||||
| -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 |
7 files changed, 12 insertions, 12 deletions
diff --git a/source3/include/smb.h b/source3/include/smb.h index b703dc5d8f3..69875a63c63 100644 --- a/source3/include/smb.h +++ b/source3/include/smb.h @@ -405,7 +405,7 @@ Offset Data length. * We reuse some ignored flags for private use. Passed in the private_flags * argument. */ -#define NTCREATEX_OPTIONS_PRIVATE_DENY_DOS 0x0001 +#define NTCREATEX_FLAG_DENY_DOS 0x0001 #define NTCREATEX_OPTIONS_PRIVATE_DENY_FCB 0x0002 /* Private options for printer support */ diff --git a/source3/lib/util.c b/source3/lib/util.c index 62584bc7ca2..79e3b6e2c78 100644 --- a/source3/lib/util.c +++ b/source3/lib/util.c @@ -1722,7 +1722,7 @@ uint32_t map_share_mode_to_deny_mode(uint32_t share_access, uint32_t private_opt case FILE_SHARE_READ|FILE_SHARE_WRITE: return DENY_NONE; } - if (private_options & NTCREATEX_OPTIONS_PRIVATE_DENY_DOS) { + if (private_options & NTCREATEX_FLAG_DENY_DOS) { return DENY_DOS; } else if (private_options & NTCREATEX_OPTIONS_PRIVATE_DENY_FCB) { return DENY_FCB; @@ -2038,7 +2038,7 @@ bool map_open_params_to_ntcreate(const char *smb_base_fname, break; case DENY_DOS: - private_flags |= NTCREATEX_OPTIONS_PRIVATE_DENY_DOS; + private_flags |= NTCREATEX_FLAG_DENY_DOS; if (is_executable(smb_base_fname)) { share_mode = FILE_SHARE_READ|FILE_SHARE_WRITE; } else { diff --git a/source3/smbd/open.c b/source3/smbd/open.c index e55e4590336..72df5a5dcfe 100644 --- a/source3/smbd/open.c +++ b/source3/smbd/open.c @@ -3329,7 +3329,7 @@ static int calculate_open_access_flags(uint32_t access_mask, says. */ need_read = - ((private_flags & NTCREATEX_OPTIONS_PRIVATE_DENY_DOS) || + ((private_flags & NTCREATEX_FLAG_DENY_DOS) || access_mask & (FILE_READ_ATTRIBUTES|FILE_READ_DATA| FILE_READ_EA|FILE_EXECUTE)); diff --git a/source3/smbd/smb1_utils.c b/source3/smbd/smb1_utils.c index 95aabddb997..add4df97b32 100644 --- a/source3/smbd/smb1_utils.c +++ b/source3/smbd/smb1_utils.c @@ -42,7 +42,7 @@ struct files_struct *fcb_or_dos_open( NTSTATUS status; if ((private_flags & - (NTCREATEX_OPTIONS_PRIVATE_DENY_DOS| + (NTCREATEX_FLAG_DENY_DOS| NTCREATEX_OPTIONS_PRIVATE_DENY_FCB)) == 0) { return NULL; @@ -67,7 +67,7 @@ struct files_struct *fcb_or_dos_open( fsp->vuid == req->vuid && fsp->file_pid == req->smbpid && (fsp->fh->private_options & - (NTCREATEX_OPTIONS_PRIVATE_DENY_DOS | + (NTCREATEX_FLAG_DENY_DOS | NTCREATEX_OPTIONS_PRIVATE_DENY_FCB)) && (fsp->access_mask & FILE_WRITE_DATA) && strequal(fsp->fsp_name->base_name, smb_fname->base_name) && @@ -84,7 +84,7 @@ struct files_struct *fcb_or_dos_open( /* quite an insane set of semantics ... */ if (is_executable(smb_fname->base_name) && - (fsp->fh->private_options & NTCREATEX_OPTIONS_PRIVATE_DENY_DOS)) { + (fsp->fh->private_options & NTCREATEX_FLAG_DENY_DOS)) { DBG_DEBUG("file fail due to is_executable.\n"); return NULL; } 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); |