From 8bf40cda5392e3facf85fcea53eef07ceeb07226 Mon Sep 17 00:00:00 2001 From: Ralph Boehme Date: Thu, 5 Sep 2024 19:00:32 +0200 Subject: [PATCH] smbd: in smb_set_file_time() rename "action" variable to "filter" This matches the notify_fname() argument name and the next commit is going to add an "action" variable. Signed-off-by: Ralph Boehme Reviewed-by: Stefan Metzmacher --- source3/smbd/smb2_trans2.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/source3/smbd/smb2_trans2.c b/source3/smbd/smb2_trans2.c index f279753622a..fd981ecb636 100644 --- a/source3/smbd/smb2_trans2.c +++ b/source3/smbd/smb2_trans2.c @@ -3831,7 +3831,7 @@ NTSTATUS smb_set_file_time(connection_struct *conn, { struct files_struct *set_fsp = NULL; struct timeval_buf tbuf[4]; - uint32_t action = + uint32_t filter = FILE_NOTIFY_CHANGE_LAST_ACCESS |FILE_NOTIFY_CHANGE_LAST_WRITE |FILE_NOTIFY_CHANGE_CREATION; @@ -3850,20 +3850,20 @@ NTSTATUS smb_set_file_time(connection_struct *conn, /* get some defaults (no modifications) if any info is zero or -1. */ if (is_omit_timespec(&ft->create_time)) { - action &= ~FILE_NOTIFY_CHANGE_CREATION; + filter &= ~FILE_NOTIFY_CHANGE_CREATION; } if (is_omit_timespec(&ft->atime)) { - action &= ~FILE_NOTIFY_CHANGE_LAST_ACCESS; + filter &= ~FILE_NOTIFY_CHANGE_LAST_ACCESS; } if (is_omit_timespec(&ft->mtime)) { - action &= ~FILE_NOTIFY_CHANGE_LAST_WRITE; + filter &= ~FILE_NOTIFY_CHANGE_LAST_WRITE; } if (!setting_write_time) { /* ft->mtime comes from change time, not write time. */ - action &= ~FILE_NOTIFY_CHANGE_LAST_WRITE; + filter &= ~FILE_NOTIFY_CHANGE_LAST_WRITE; } /* Ensure the resolution is the correct for @@ -3909,7 +3909,7 @@ NTSTATUS smb_set_file_time(connection_struct *conn, notify_fname(conn, NOTIFY_ACTION_MODIFIED, - action, + filter, smb_fname, NULL); return NT_STATUS_OK; -- 2.47.3