diff options
author | Jeremy Allison <jra@samba.org> | 2017-05-24 11:35:50 -0700 |
---|---|---|
committer | Jeremy Allison <jra@samba.org> | 2017-05-31 22:50:22 +0200 |
commit | 12b801d9d7856f1bb50619962f7e9cb94e75087f (patch) | |
tree | 3f2680ac6ce0d1dff13f652782a16d4e2643c8bd /source3/modules/vfs_snapper.c | |
parent | 892476b555f57bcbe40883c533e208c81be168c9 (diff) | |
download | samba-12b801d9d7856f1bb50619962f7e9cb94e75087f.tar.gz |
s3: VFS: Change SMB_VFS_REMOVEXATTR 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/modules/vfs_snapper.c')
-rw-r--r-- | source3/modules/vfs_snapper.c | 43 |
1 files changed, 32 insertions, 11 deletions
diff --git a/source3/modules/vfs_snapper.c b/source3/modules/vfs_snapper.c index bc98f78189a..49e2c61f50c 100644 --- a/source3/modules/vfs_snapper.c +++ b/source3/modules/vfs_snapper.c @@ -2747,29 +2747,50 @@ static ssize_t snapper_gmt_listxattr(struct vfs_handle_struct *handle, } static int snapper_gmt_removexattr(vfs_handle_struct *handle, - const char *fname, const char *aname) + const struct smb_filename *smb_fname, + const char *aname) { - time_t timestamp; - char *stripped; - int ret, saved_errno; - char *conv; + time_t timestamp = 0; + char *stripped = NULL; + ssize_t ret; + int saved_errno = 0; + char *conv = NULL; + struct smb_filename *conv_smb_fname = NULL; - if (!snapper_gmt_strip_snapshot(talloc_tos(), handle, fname, - ×tamp, &stripped)) { + if (!snapper_gmt_strip_snapshot(talloc_tos(), + handle, + smb_fname->base_name, + ×tamp, + &stripped)) { return -1; } if (timestamp == 0) { - return SMB_VFS_NEXT_REMOVEXATTR(handle, fname, aname); + return SMB_VFS_NEXT_REMOVEXATTR(handle, smb_fname, aname); } conv = snapper_gmt_convert(talloc_tos(), handle, stripped, timestamp); TALLOC_FREE(stripped); if (conv == NULL) { return -1; } - ret = SMB_VFS_NEXT_REMOVEXATTR(handle, conv, aname); - saved_errno = errno; + conv_smb_fname = synthetic_smb_fname(talloc_tos(), + conv, + NULL, + NULL, + smb_fname->flags); TALLOC_FREE(conv); - errno = saved_errno; + if (conv_smb_fname == NULL) { + errno = ENOMEM; + return -1; + } + ret = SMB_VFS_NEXT_REMOVEXATTR(handle, conv_smb_fname, aname); + if (ret == -1) { + saved_errno = errno; + } + TALLOC_FREE(conv_smb_fname); + TALLOC_FREE(conv); + if (saved_errno != 0) { + errno = saved_errno; + } return ret; } |