diff options
| author | Volker Lendecke <vl@samba.org> | 2013-08-21 13:56:14 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2014-08-11 21:11:16 +0200 |
| commit | 446de4f680fad224f88c3373d92f8dd4caf8172d (patch) | |
| tree | d05840100edc263c400842cae5851b4bd5f75958 /source3/include | |
| parent | 86f914679f5a817bfb890995f2fc0beeeb765b88 (diff) | |
| download | samba-446de4f680fad224f88c3373d92f8dd4caf8172d.tar.gz samba-446de4f680fad224f88c3373d92f8dd4caf8172d.tar.xz samba-446de4f680fad224f88c3373d92f8dd4caf8172d.zip | |
vfs3: Pass "lease" through SMB_VFS_CREATE_FILE
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/vfs.h | 7 | ||||
| -rw-r--r-- | source3/include/vfs_macros.h | 8 |
2 files changed, 10 insertions, 5 deletions
diff --git a/source3/include/vfs.h b/source3/include/vfs.h index 6c0bf70068..a81fb6c1be 100644 --- a/source3/include/vfs.h +++ b/source3/include/vfs.h @@ -156,7 +156,10 @@ fsp->pending_break_messages array */ /* Leave at 31 - not yet released. add SMB_VFS_[GET/SET]_COMPRESSION() */ -#define SMB_VFS_INTERFACE_VERSION 31 +/* Bump to version 32 - Samba 4.2 will ship with that. */ +/* Version 32 - Add "lease" to CREATE_FILE operation */ + +#define SMB_VFS_INTERFACE_VERSION 32 /* All intercepted VFS operations must be declared as static functions inside module source @@ -535,6 +538,7 @@ struct vfs_fn_pointers { uint32_t create_options, uint32_t file_attributes, uint32_t oplock_request, + struct smb2_lease *lease, uint64_t allocation_size, uint32_t private_flags, struct security_descriptor *sd, @@ -940,6 +944,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, uint64_t allocation_size, uint32_t private_flags, struct security_descriptor *sd, diff --git a/source3/include/vfs_macros.h b/source3/include/vfs_macros.h index de9f55fda8..e2d494dca6 100644 --- a/source3/include/vfs_macros.h +++ b/source3/include/vfs_macros.h @@ -136,13 +136,13 @@ smb_vfs_call_open((handle)->next, (fname), (fsp), (flags), (mode)) #define SMB_VFS_CREATE_FILE(conn, req, root_dir_fid, smb_fname, access_mask, share_access, create_disposition, \ - create_options, file_attributes, oplock_request, allocation_size, private_flags, sd, ea_list, result, pinfo) \ + create_options, file_attributes, oplock_request, lease, allocation_size, private_flags, sd, ea_list, result, pinfo) \ smb_vfs_call_create_file((conn)->vfs_handles, (req), (root_dir_fid), (smb_fname), (access_mask), (share_access), (create_disposition), \ - (create_options), (file_attributes), (oplock_request), (allocation_size), (private_flags), (sd), (ea_list), (result), (pinfo)) + (create_options), (file_attributes), (oplock_request), (lease), (allocation_size), (private_flags), (sd), (ea_list), (result), (pinfo)) #define SMB_VFS_NEXT_CREATE_FILE(handle, req, root_dir_fid, smb_fname, access_mask, share_access, create_disposition, \ - create_options, file_attributes, oplock_request, allocation_size, private_flags, sd, ea_list, result, pinfo) \ + create_options, file_attributes, oplock_request, lease, allocation_size, private_flags, sd, ea_list, result, pinfo) \ smb_vfs_call_create_file((handle)->next, (req), (root_dir_fid), (smb_fname), (access_mask), (share_access), (create_disposition), \ - (create_options), (file_attributes), (oplock_request), (allocation_size), (private_flags), (sd), (ea_list), (result), (pinfo)) + (create_options), (file_attributes), (oplock_request), (lease), (allocation_size), (private_flags), (sd), (ea_list), (result), (pinfo)) #define SMB_VFS_CLOSE(fsp) \ smb_vfs_call_close((fsp)->conn->vfs_handles, (fsp)) |