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>

diff --git a/source3/include/smb.h b/source3/include/smb.h
index b703dc5d8f3fed4251d64c360035636796c4d7fb..69875a63c638e0d170f3f71980e1fc506ca55472 100644 (file)
--- 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 62584bc7ca2b82158b72ef5d8a173e0d80e33203..79e3b6e2c783dc16bf95c188846df52fda9f7ea0 100644 (file)
--- 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 e55e45903366c10470b8921b14aa4ca767df2dca..72df5a5dcfe610c7560af40841930f6acc137dd8 100644 (file)
--- 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 95aabddb99788c09b27e0510aad4ee79511346aa..add4df97b32708c8101a459a94893a0d54a9e219 100644 (file)
--- 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 d770fa56149e9a7d4a0f5b12263dd0ec58f89f69..a9653886fb99f9e950a60cc4c14f9b6e2c05ef7a 100644 (file)
--- 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 a492f7e97fb8247cad9cf5b8867016123b28a5ce..11f70a6bcc7fb314aa69ac0d85fc227c7e786c15 100644 (file)
--- 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 48d2712315f55ca3801f18aaf9ce9205767271bf..31bd0d75b7e4d2d19629da8d74252e2e31fb760a 100644 (file)
--- 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);