From: Ralph Boehme <slow@samba.org>
Date: Fri, 23 Oct 2020 15:42:28 +0000 (+0200)
Subject: smb: rename NTCREATEX_OPTIONS_PRIVATE_DENY_FCB to NTCREATEX_FLAG_DENY_FCB
X-Git-Tag: talloc-2.3.2~126
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c2f0fd40da0caefdf410531a38c858f7a0f8af10;p=thirdparty%2Fsamba.git

smb: rename NTCREATEX_OPTIONS_PRIVATE_DENY_FCB to NTCREATEX_FLAG_DENY_FCB

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 69875a63c63..382ad08d430 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -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
diff --git a/source3/lib/util.c b/source3/lib/util.c
index 79e3b6e2c78..46e0748cdd3 100644
--- a/source3/lib/util.c
+++ b/source3/lib/util.c
@@ -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;
 
diff --git a/source3/smbd/smb1_utils.c b/source3/smbd/smb1_utils.c
index add4df97b32..6f587dfa60b 100644
--- a/source3/smbd/smb1_utils.c
+++ b/source3/smbd/smb1_utils.c
@@ -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,
diff --git a/source4/libcli/raw/smb.h b/source4/libcli/raw/smb.h
index a9653886fb9..780260e1679 100644
--- a/source4/libcli/raw/smb.h
+++ b/source4/libcli/raw/smb.h
@@ -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 */
diff --git a/source4/ntvfs/ntvfs_generic.c b/source4/ntvfs/ntvfs_generic.c
index 11f70a6bcc7..de0ae2ce828 100644
--- a/source4/ntvfs/ntvfs_generic.c
+++ b/source4/ntvfs/ntvfs_generic.c
@@ -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:
diff --git a/source4/ntvfs/posix/pvfs_open.c b/source4/ntvfs/posix/pvfs_open.c
index 31bd0d75b7e..de6c0efdb3d 100644
--- a/source4/ntvfs/posix/pvfs_open.c
+++ b/source4/ntvfs/posix/pvfs_open.c
@@ -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);