diff options
| author | Jeremy Allison <jra@samba.org> | 2019-10-10 14:35:37 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2019-10-15 20:07:51 +0000 |
| commit | b01169ff32188939752c064e2eb803f57a837522 (patch) | |
| tree | c5476f4d799c43dee9a00967353eb4955ad903bd /source3/include | |
| parent | e2863a7e395bc5b73f8d9ef7bca7c21f20c7eeb3 (diff) | |
| download | samba-b01169ff32188939752c064e2eb803f57a837522.tar.gz | |
s3: VFS: Complete the removal of SMB_VFS_CHOWN()
No longer used anywhere.
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Böhme <slow@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Tue Oct 15 20:07:51 UTC 2019 on sn-devel-184
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/smbprofile.h | 1 | ||||
| -rw-r--r-- | source3/include/vfs.h | 13 | ||||
| -rw-r--r-- | source3/include/vfs_macros.h | 5 |
3 files changed, 1 insertions, 18 deletions
diff --git a/source3/include/smbprofile.h b/source3/include/smbprofile.h index 41621c4e862..a003a1d9df0 100644 --- a/source3/include/smbprofile.h +++ b/source3/include/smbprofile.h @@ -69,7 +69,6 @@ struct tevent_context; SMBPROFILE_STATS_BASIC(syscall_unlinkat) \ SMBPROFILE_STATS_BASIC(syscall_chmod) \ SMBPROFILE_STATS_BASIC(syscall_fchmod) \ - SMBPROFILE_STATS_BASIC(syscall_chown) \ SMBPROFILE_STATS_BASIC(syscall_fchown) \ SMBPROFILE_STATS_BASIC(syscall_lchown) \ SMBPROFILE_STATS_BASIC(syscall_chdir) \ diff --git a/source3/include/vfs.h b/source3/include/vfs.h index 5ea4f805817..802eb8d0292 100644 --- a/source3/include/vfs.h +++ b/source3/include/vfs.h @@ -285,6 +285,7 @@ /* Version 42 - Add SMB_VFS_FCNTL */ /* Version 42 - Remove SMB_VFS_RMDIR. Use SMB_VFS_UNLINKAT(.., AT_REMOVEDIR) instead. */ +/* Version 42 - Remove SMB_VFS_CHOWN */ #define SMB_VFS_INTERFACE_VERSION 42 @@ -786,10 +787,6 @@ struct vfs_fn_pointers { const struct smb_filename *smb_fname, mode_t mode); int (*fchmod_fn)(struct vfs_handle_struct *handle, struct files_struct *fsp, mode_t mode); - int (*chown_fn)(struct vfs_handle_struct *handle, - const struct smb_filename *smb_fname, - uid_t uid, - gid_t gid); int (*fchown_fn)(struct vfs_handle_struct *handle, struct files_struct *fsp, uid_t uid, gid_t gid); int (*lchown_fn)(struct vfs_handle_struct *handle, const struct smb_filename *smb_fname, @@ -1316,10 +1313,6 @@ int smb_vfs_call_chmod(struct vfs_handle_struct *handle, mode_t mode); int smb_vfs_call_fchmod(struct vfs_handle_struct *handle, struct files_struct *fsp, mode_t mode); -int smb_vfs_call_chown(struct vfs_handle_struct *handle, - const struct smb_filename *smb_fname, - uid_t uid, - gid_t gid); int smb_vfs_call_fchown(struct vfs_handle_struct *handle, struct files_struct *fsp, uid_t uid, gid_t gid); int smb_vfs_call_lchown(struct vfs_handle_struct *handle, @@ -1755,10 +1748,6 @@ int vfs_not_implemented_chmod(vfs_handle_struct *handle, mode_t mode); int vfs_not_implemented_fchmod(vfs_handle_struct *handle, files_struct *fsp, mode_t mode); -int vfs_not_implemented_chown(vfs_handle_struct *handle, - const struct smb_filename *smb_fname, - uid_t uid, - gid_t gid); int vfs_not_implemented_fchown(vfs_handle_struct *handle, files_struct *fsp, uid_t uid, gid_t gid); int vfs_not_implemented_lchown(vfs_handle_struct *handle, diff --git a/source3/include/vfs_macros.h b/source3/include/vfs_macros.h index 95cf4cf3088..6a7cbf2275d 100644 --- a/source3/include/vfs_macros.h +++ b/source3/include/vfs_macros.h @@ -231,11 +231,6 @@ #define SMB_VFS_NEXT_FCHMOD(handle, fsp, mode) \ smb_vfs_call_fchmod((handle)->next, (fsp), (mode)) -#define SMB_VFS_CHOWN(conn, smb_fname, uid, gid) \ - smb_vfs_call_chown((conn)->vfs_handles, (smb_fname), (uid), (gid)) -#define SMB_VFS_NEXT_CHOWN(handle, smb_fname, uid, gid) \ - smb_vfs_call_chown((handle)->next, (smb_fname), (uid), (gid)) - #define SMB_VFS_FCHOWN(fsp, uid, gid) \ smb_vfs_call_fchown((fsp)->conn->vfs_handles, (fsp), (uid), (gid)) #define SMB_VFS_NEXT_FCHOWN(handle, fsp, uid, gid) \ |