diff options
| author | Jeremy Allison <jra@samba.org> | 2017-05-24 10:47:46 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2017-05-31 22:50:22 +0200 |
| commit | aada94885dce29334e34c9aae32c22e7acfc1174 (patch) | |
| tree | 9d8537532716da3435d583081182361d01588eae /source3/include | |
| parent | f5dd864606d5e587b85695ea11520df31b353fb8 (diff) | |
| download | samba-aada94885dce29334e34c9aae32c22e7acfc1174.tar.gz | |
s3: VFS: Change SMB_VFS_SYS_ACL_SET_FILE to use const struct smb_filename * instead of const char *.
We need to migrate all pathname based VFS calls to use a struct
to finish modernising the VFS with extra timestamp and flags parameters.
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/smb_acls.h | 4 | ||||
| -rw-r--r-- | source3/include/vfs.h | 12 | ||||
| -rw-r--r-- | source3/include/vfs_macros.h | 8 |
3 files changed, 16 insertions, 8 deletions
diff --git a/source3/include/smb_acls.h b/source3/include/smb_acls.h index f5603f3f38b..73b67af020e 100644 --- a/source3/include/smb_acls.h +++ b/source3/include/smb_acls.h @@ -59,7 +59,9 @@ SMB_ACL_T sys_acl_get_file(struct vfs_handle_struct *handle, SMB_ACL_T sys_acl_get_fd(struct vfs_handle_struct *handle, struct files_struct *fsp, TALLOC_CTX *mem_ctx); int sys_acl_set_file(struct vfs_handle_struct *handle, - const char *name, SMB_ACL_TYPE_T type, SMB_ACL_T acl_d); + const struct smb_filename *smb_fname, + SMB_ACL_TYPE_T type, + SMB_ACL_T acl_d); int sys_acl_set_fd(struct vfs_handle_struct *handle, struct files_struct *fsp, SMB_ACL_T acl_d); int sys_acl_delete_def_file(struct vfs_handle_struct *handle, diff --git a/source3/include/vfs.h b/source3/include/vfs.h index e32952a582a..f3a0b323923 100644 --- a/source3/include/vfs.h +++ b/source3/include/vfs.h @@ -203,6 +203,8 @@ to const struct smb_filename * */ /* Version 37 - Change sys_acl_blob_get_file from const char * to const struct smb_filename * */ +/* Version 37 - Change sys_acl_set_file from const char * + to const struct smb_filename * */ #define SMB_VFS_INTERFACE_VERSION 37 @@ -876,7 +878,10 @@ struct vfs_fn_pointers { int (*sys_acl_blob_get_fd_fn)(struct vfs_handle_struct *handle, struct files_struct *fsp, TALLOC_CTX *mem_ctx, char **blob_description, DATA_BLOB *blob); - int (*sys_acl_set_file_fn)(struct vfs_handle_struct *handle, const char *name, SMB_ACL_TYPE_T acltype, SMB_ACL_T theacl); + int (*sys_acl_set_file_fn)(struct vfs_handle_struct *handle, + const struct smb_filename *smb_fname, + SMB_ACL_TYPE_T acltype, + SMB_ACL_T theacl); int (*sys_acl_set_fd_fn)(struct vfs_handle_struct *handle, struct files_struct *fsp, SMB_ACL_T theacl); int (*sys_acl_delete_def_file_fn)(struct vfs_handle_struct *handle, const struct smb_filename *smb_fname); @@ -1335,8 +1340,9 @@ int smb_vfs_call_sys_acl_blob_get_fd(struct vfs_handle_struct *handle, char **blob_description, DATA_BLOB *blob); int smb_vfs_call_sys_acl_set_file(struct vfs_handle_struct *handle, - const char *name, SMB_ACL_TYPE_T acltype, - SMB_ACL_T theacl); + const struct smb_filename *smb_fname, + SMB_ACL_TYPE_T acltype, + SMB_ACL_T theacl); int smb_vfs_call_sys_acl_set_fd(struct vfs_handle_struct *handle, struct files_struct *fsp, SMB_ACL_T theacl); int smb_vfs_call_sys_acl_delete_def_file(struct vfs_handle_struct *handle, diff --git a/source3/include/vfs_macros.h b/source3/include/vfs_macros.h index 0ca601a89ab..ac04093b108 100644 --- a/source3/include/vfs_macros.h +++ b/source3/include/vfs_macros.h @@ -500,10 +500,10 @@ #define SMB_VFS_NEXT_SYS_ACL_BLOB_GET_FD(handle, fsp, mem_ctx, blob_description, blob) \ smb_vfs_call_sys_acl_blob_get_fd((handle)->next, (fsp), mem_ctx, (blob_description), (blob)) -#define SMB_VFS_SYS_ACL_SET_FILE(conn, name, acltype, theacl) \ - smb_vfs_call_sys_acl_set_file((conn)->vfs_handles, (name), (acltype), (theacl)) -#define SMB_VFS_NEXT_SYS_ACL_SET_FILE(handle, name, acltype, theacl) \ - smb_vfs_call_sys_acl_set_file((handle)->next, (name), (acltype), (theacl)) +#define SMB_VFS_SYS_ACL_SET_FILE(conn, smb_fname, acltype, theacl) \ + smb_vfs_call_sys_acl_set_file((conn)->vfs_handles, (smb_fname), (acltype), (theacl)) +#define SMB_VFS_NEXT_SYS_ACL_SET_FILE(handle, smb_fname, acltype, theacl) \ + smb_vfs_call_sys_acl_set_file((handle)->next, (smb_fname), (acltype), (theacl)) #define SMB_VFS_SYS_ACL_SET_FD(fsp, theacl) \ smb_vfs_call_sys_acl_set_fd((fsp)->conn->vfs_handles, (fsp), (theacl)) |