sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-22 05:57:43 +03:00
Code

source3/smbd: Update timestamps after a successful SMB_VFS_FNTIMES

Browse Source 
When an open file handle is used to change timestamps we fail to return
updated values to clients until next open is issued. Unless we fill in
the timestamps subsequent calls like GETINFO cannot see the latest value
causing incorrect results. Therefore copy those timestamp values as soon
as it is set on the backend.

Signed-off-by: Anoop C S <anoopcs@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
This commit is contained in:
Anoop C S 2024-03-22 11:38:08 +05:30
parent a3126ebfe5
commit f3c185a629
3 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source3/include/proto.h
View File

@ -173,6 +173,7 @@ void update_stat_ex_mtime(struct stat_ex *dst, struct timespec write_ts);
void update_stat_ex_create_time(struct stat_ex *dst, struct timespec create_time);
void update_stat_ex_from_saved_stat(struct stat_ex *dst,
const struct stat_ex *src);
void copy_stat_ex_timestamps(files_struct *fsp, const struct smb_file_time *ft);
int sys_stat(const char *fname, SMB_STRUCT_STAT *sbuf,
bool fake_dir_create_times);
int sys_fstat(int fd, SMB_STRUCT_STAT *sbuf,

19
source3/lib/system.c
View File

@ -249,6 +249,25 @@ void update_stat_ex_from_saved_stat(struct stat_ex *dst,
}
}
void copy_stat_ex_timestamps(files_struct *fsp, const struct smb_file_time *ft)
{
if (!is_omit_timespec(&ft->atime)) {
fsp->fsp_name->st.st_ex_atime = ft->atime;
}
if (!is_omit_timespec(&ft->create_time)) {
fsp->fsp_name->st.st_ex_btime = ft->create_time;
}
if (!is_omit_timespec(&ft->ctime)) {
fsp->fsp_name->st.st_ex_ctime = ft->ctime;
}
if (!is_omit_timespec(&ft->mtime)) {
fsp->fsp_name->st.st_ex_mtime = ft->mtime;
}
}
void init_stat_ex_from_stat (struct stat_ex *dst,
const struct stat *src,
bool fake_dir_create_times)

8
source3/smbd/dosmode.c
View File

@ -1189,7 +1189,8 @@ int file_ntimes(connection_struct *conn,
}
if (SMB_VFS_FNTIMES(fsp, ft) == 0) {
return 0;
ret = 0;
goto done;
}
if((errno != EPERM) && (errno != EACCES)) {
@ -1214,6 +1215,11 @@ int file_ntimes(connection_struct *conn,
unbecome_root();
}
done:
if (ret == 0) {
copy_stat_ex_timestamps(fsp, ft);
}
return ret;
}