smbd: make conflicting_access available to other functions

The next commit adds more users of conflicting_access.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14375

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>

diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index b6a326531aaf7c8cdeec3cacd6bd471862522d86..98fa1a872038a7956be81be25040535d64ad8367 100644 (file)
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -1493,17 +1493,18 @@ static bool mask_conflict(
  Returns True if conflict, False if not.
 ****************************************************************************/
 
+static const uint32_t conflicting_access =
+       FILE_WRITE_DATA|
+       FILE_APPEND_DATA|
+       FILE_READ_DATA|
+       FILE_EXECUTE|
+       DELETE_ACCESS;
+
 static bool share_conflict(uint32_t e_access_mask,
                           uint32_t e_share_access,
                           uint32_t access_mask,
                           uint32_t share_access)
 {
-       const uint32_t conflicting_access =
-               FILE_WRITE_DATA|
-               FILE_APPEND_DATA|
-               FILE_READ_DATA|
-               FILE_EXECUTE|
-               DELETE_ACCESS;
        bool conflict;
 
        DBG_DEBUG("existing access_mask = 0x%"PRIx32", "