diff options
| author | Pavel Filipenský <pfilipen@redhat.com> | 2022-02-07 23:06:10 +0100 |
|---|---|---|
| committer | Jule Anger <janger@samba.org> | 2022-02-14 14:26:30 +0000 |
| commit | e1e2bae551ebf031634c3b33a7fe3cb9fad7e8ee (patch) | |
| tree | 11c248ac8de889727fa1e945a6b3f762eed9b6aa | |
| parent | 63f6fac589e0fb210521e80111f53a8914a5f1a0 (diff) | |
| download | samba-e1e2bae551ebf031634c3b33a7fe3cb9fad7e8ee.tar.gz | |
s3:modules: Fix virusfilter_vfs_openat
Bug: https://bugzilla.samba.org/show_bug.cgi?id=14971
Signed-off-by: Pavel Filipenský <pfilipen@redhat.com>
Pair-Programmed-With: Andreas Schneider <asn@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Thu Feb 10 22:09:06 UTC 2022 on sn-devel-184
(cherry picked from commit 3f1c958f6fa9d2991185f4e281a377a295d09f9c)
Autobuild-User(v4-16-test): Jule Anger <janger@samba.org>
Autobuild-Date(v4-16-test): Mon Feb 14 14:26:30 UTC 2022 on sn-devel-184
| -rw-r--r-- | selftest/knownfail.d/virus_scanner | 2 | ||||
| -rw-r--r-- | source3/modules/vfs_virusfilter.c | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/selftest/knownfail.d/virus_scanner b/selftest/knownfail.d/virus_scanner deleted file mode 100644 index 6df3fd20627..00000000000 --- a/selftest/knownfail.d/virus_scanner +++ /dev/null @@ -1,2 +0,0 @@ -^samba3.blackbox.virus_scanner.check_infected_read # test download infected file ('vfs objects = virusfilter') -^samba3.blackbox.virus_scanner.check_infected_write # test upload infected file ('vfs objects = virusfilter') diff --git a/source3/modules/vfs_virusfilter.c b/source3/modules/vfs_virusfilter.c index e6cbee7cd45..d1554967ad1 100644 --- a/source3/modules/vfs_virusfilter.c +++ b/source3/modules/vfs_virusfilter.c @@ -1309,21 +1309,21 @@ static int virusfilter_vfs_openat(struct vfs_handle_struct *handle, */ goto virusfilter_vfs_open_next; } - ret = S_ISREG(smb_fname->st.st_ex_mode); + ret = S_ISREG(sbuf.st_ex_mode); if (ret == 0) { DBG_INFO("Not scanned: Directory or special file: %s/%s\n", cwd_fname, fname); goto virusfilter_vfs_open_next; } if (config->max_file_size > 0 && - smb_fname->st.st_ex_size > config->max_file_size) + sbuf.st_ex_size > config->max_file_size) { DBG_INFO("Not scanned: file size > max file size: %s/%s\n", cwd_fname, fname); goto virusfilter_vfs_open_next; } if (config->min_file_size > 0 && - smb_fname->st.st_ex_size < config->min_file_size) + sbuf.st_ex_size < config->min_file_size) { DBG_INFO("Not scanned: file size < min file size: %s/%s\n", cwd_fname, fname); |