smbd: Make "lease" const in SMB_VFS_CREATE_FILE()

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/examples/VFS/skel_opaque.c b/examples/VFS/skel_opaque.c
index 4b2b11a1aaa4be8fcd39ef2c0ab3f143c5bf3e79..55b576302a1e9b5de2f70903cc1c995d51029e9a 100644 (file)
--- a/examples/VFS/skel_opaque.c
+++ b/examples/VFS/skel_opaque.c
@@ -203,7 +203,7 @@ static NTSTATUS skel_create_file(struct vfs_handle_struct *handle,
                                 uint32_t create_options,
                                 uint32_t file_attributes,
                                 uint32_t oplock_request,
-                                struct smb2_lease *lease,
+                                const struct smb2_lease *lease,
                                 uint64_t allocation_size,
                                 uint32_t private_flags,
                                 struct security_descriptor *sd,

diff --git a/examples/VFS/skel_transparent.c b/examples/VFS/skel_transparent.c
index 0de01ac9d54af9f7471dfd47f18bb7db2717fa60..eae2e9d50274d82fdcdfd41a0beedae969c9da1a 100644 (file)
--- a/examples/VFS/skel_transparent.c
+++ b/examples/VFS/skel_transparent.c
@@ -198,7 +198,7 @@ static NTSTATUS skel_create_file(struct vfs_handle_struct *handle,
                                 uint32_t create_options,
                                 uint32_t file_attributes,
                                 uint32_t oplock_request,
-                                struct smb2_lease *lease,
+                                const struct smb2_lease *lease,
                                 uint64_t allocation_size,
                                 uint32_t private_flags,
                                 struct security_descriptor *sd,

diff --git a/source3/include/vfs.h b/source3/include/vfs.h
index 268f286916c536c040e93b63576bf10ce10ce132..aec9546681be83c5acd755f1cf09190d1c4d05fa 100644 (file)
--- a/source3/include/vfs.h
+++ b/source3/include/vfs.h
@@ -271,6 +271,7 @@
 /* Version 41 - Remove "msg_ctx" parameter from SMB_VFS_BRL_UNLOCK_WINDOWS */
 /* Bump to version 42, Samba 4.12 will ship with that */
 /* Version 42 - Remove share_access member from struct files_struct */
+/* Version 42 - Make "lease" a const* in create_file_fn */
 
 #define SMB_VFS_INTERFACE_VERSION 42
 
@@ -714,7 +715,7 @@ struct vfs_fn_pointers {
                                   uint32_t create_options,
                                   uint32_t file_attributes,
                                   uint32_t oplock_request,
-                                  struct smb2_lease *lease,
+                                  const struct smb2_lease *lease,
                                   uint64_t allocation_size,
                                   uint32_t private_flags,
                                   struct security_descriptor *sd,
@@ -1211,7 +1212,7 @@ NTSTATUS smb_vfs_call_create_file(struct vfs_handle_struct *handle,
                                  uint32_t create_options,
                                  uint32_t file_attributes,
                                  uint32_t oplock_request,
-                                 struct smb2_lease *lease,
+                                 const struct smb2_lease *lease,
                                  uint64_t allocation_size,
                                  uint32_t private_flags,
                                  struct security_descriptor *sd,
@@ -1649,7 +1650,7 @@ NTSTATUS vfs_not_implemented_create_file(struct vfs_handle_struct *handle,
                                uint32_t create_options,
                                uint32_t file_attributes,
                                uint32_t oplock_request,
-                               struct smb2_lease *lease,
+                               const struct smb2_lease *lease,
                                uint64_t allocation_size,
                                uint32_t private_flags,
                                struct security_descriptor *sd,

diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c
index 84c22bb15174ea39f6fc7e69e387a061fc2af7f3..6580a05bbd640e144dcfa4f200784e295baddb3f 100644 (file)
--- a/source3/modules/vfs_default.c
+++ b/source3/modules/vfs_default.c
@@ -569,7 +569,7 @@ static NTSTATUS vfswrap_create_file(vfs_handle_struct *handle,
                                    uint32_t create_options,
                                    uint32_t file_attributes,
                                    uint32_t oplock_request,
-                                   struct smb2_lease *lease,
+                                   const struct smb2_lease *lease,
                                    uint64_t allocation_size,
                                    uint32_t private_flags,
                                    struct security_descriptor *sd,

diff --git a/source3/modules/vfs_fruit.c b/source3/modules/vfs_fruit.c
index 8289be3b3ca7551c20d5495054d035d0215c0033..2960aed12c4d78bdaf4619b831da9846e1e90292 100644 (file)
--- a/source3/modules/vfs_fruit.c
+++ b/source3/modules/vfs_fruit.c
@@ -3939,7 +3939,7 @@ static NTSTATUS fruit_create_file(vfs_handle_struct *handle,
                                  uint32_t create_options,
                                  uint32_t file_attributes,
                                  uint32_t oplock_request,
-                                 struct smb2_lease *lease,
+                                 const struct smb2_lease *lease,
                                  uint64_t allocation_size,
                                  uint32_t private_flags,
                                  struct security_descriptor *sd,

diff --git a/source3/modules/vfs_full_audit.c b/source3/modules/vfs_full_audit.c
index f6e115169700ec519306af79364596291e902a57..bc644c8f8ed41767f51e0e1efc33c71abb743cfb 100644 (file)
--- a/source3/modules/vfs_full_audit.c
+++ b/source3/modules/vfs_full_audit.c
@@ -1059,7 +1059,7 @@ static NTSTATUS smb_full_audit_create_file(vfs_handle_struct *handle,
                                      uint32_t create_options,
                                      uint32_t file_attributes,
                                      uint32_t oplock_request,
-                                     struct smb2_lease *lease,
+                                     const struct smb2_lease *lease,
                                      uint64_t allocation_size,
                                      uint32_t private_flags,
                                      struct security_descriptor *sd,

diff --git a/source3/modules/vfs_media_harmony.c b/source3/modules/vfs_media_harmony.c
index ea49eff6d8ff1bb09fb43407c0978883a579c386..9523c6fca57fe5137a7d805929b73183de57dd4f 100644 (file)
--- a/source3/modules/vfs_media_harmony.c
+++ b/source3/modules/vfs_media_harmony.c
@@ -1198,7 +1198,7 @@ static NTSTATUS mh_create_file(vfs_handle_struct *handle,
                uint32_t create_options,
                uint32_t file_attributes,
                uint32_t oplock_request,
-               struct smb2_lease *lease,
+               const struct smb2_lease *lease,
                uint64_t allocation_size,
                uint32_t private_flags,
                struct security_descriptor *sd,

diff --git a/source3/modules/vfs_not_implemented.c b/source3/modules/vfs_not_implemented.c
index e3a39d57ca262e7e2089ee75522fde68f6fd9372..a29ce9c3353377945f09fd16c83de6371177b02f 100644 (file)
--- a/source3/modules/vfs_not_implemented.c
+++ b/source3/modules/vfs_not_implemented.c
@@ -201,7 +201,7 @@ NTSTATUS vfs_not_implemented_create_file(struct vfs_handle_struct *handle,
                                uint32_t create_options,
                                uint32_t file_attributes,
                                uint32_t oplock_request,
-                               struct smb2_lease *lease,
+                               const struct smb2_lease *lease,
                                uint64_t allocation_size,
                                uint32_t private_flags,
                                struct security_descriptor *sd,

diff --git a/source3/modules/vfs_time_audit.c b/source3/modules/vfs_time_audit.c
index 2fb847b1b34f64860850323e509c504330b8e8d1..1d82ffe454fde6af0995dbc2003ccfd1fae3ab5b 100644 (file)
--- a/source3/modules/vfs_time_audit.c
+++ b/source3/modules/vfs_time_audit.c
@@ -598,7 +598,7 @@ static NTSTATUS smb_time_audit_create_file(vfs_handle_struct *handle,
                                           uint32_t create_options,
                                           uint32_t file_attributes,
                                           uint32_t oplock_request,
-                                          struct smb2_lease *lease,
+                                          const struct smb2_lease *lease,
                                           uint64_t allocation_size,
                                           uint32_t private_flags,
                                           struct security_descriptor *sd,

diff --git a/source3/modules/vfs_unityed_media.c b/source3/modules/vfs_unityed_media.c
index 43285191cd2abe3f567389ebdcfa2c9b8bcedddd..cc531d46701e15e19e1a1b21601ddc4ffd30182b 100644 (file)
--- a/source3/modules/vfs_unityed_media.c
+++ b/source3/modules/vfs_unityed_media.c
@@ -907,7 +907,7 @@ static NTSTATUS um_create_file(vfs_handle_struct *handle,
                               uint32_t create_options,
                               uint32_t file_attributes,
                               uint32_t oplock_request,
-                              struct smb2_lease *lease,
+                              const struct smb2_lease *lease,
                               uint64_t allocation_size,
                               uint32_t private_flags,
                               struct security_descriptor *sd,

diff --git a/source3/modules/vfs_worm.c b/source3/modules/vfs_worm.c
index a956911591c492819941b6dc24db7d2891d9ab1d..9b1a5facae7134a5f3fc1bbf51af8a018c4e9c32 100644 (file)
--- a/source3/modules/vfs_worm.c
+++ b/source3/modules/vfs_worm.c
@@ -32,7 +32,7 @@ static NTSTATUS vfs_worm_create_file(vfs_handle_struct *handle,
                                     uint32_t create_options,
                                     uint32_t file_attributes,
                                     uint32_t oplock_request,
-                                    struct smb2_lease *lease,
+                                    const struct smb2_lease *lease,
                                     uint64_t allocation_size,
                                     uint32_t private_flags,
                                     struct security_descriptor *sd,

diff --git a/source3/smbd/vfs.c b/source3/smbd/vfs.c
index 51a4aeb0f2253fbd76cb0950439f86f1f75ec691..b8b482e758ef2ffffcaf6ff08dc4bc7f2252d98f 100644 (file)
--- a/source3/smbd/vfs.c
+++ b/source3/smbd/vfs.c
@@ -1613,7 +1613,7 @@ NTSTATUS smb_vfs_call_create_file(struct vfs_handle_struct *handle,
                                  uint32_t create_options,
                                  uint32_t file_attributes,
                                  uint32_t oplock_request,
-                                 struct smb2_lease *lease,
+                                 const struct smb2_lease *lease,
                                  uint64_t allocation_size,
                                  uint32_t private_flags,
                                  struct security_descriptor *sd,