import samba-4.14.5-2.el8

This commit is contained in:
CentOS Sources 2021-07-17 04:25:51 +00:00 committed by Andrew Lukoshko
parent 0524fc010f
commit 756267da85
2 changed files with 80 additions and 7 deletions

View File

@ -0,0 +1,49 @@
From 4b192aaf503ea7f5eba27b6e43edcfe54ac6c5a6 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Wed, 26 May 2021 15:04:08 +0200
Subject: [PATCH] s3:modules: Reduce debug level if file doesn't exists on dfs
share
There is software out there trying to open desktop.ini in every
directory. Avoid spamming the logs with error messages.
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Fri Jun 18 18:14:11 UTC 2021 on sn-devel-184
(cherry picked from commit 4079efae76718a84a4cf24b6613cdc53cdb2dd39)
---
source3/modules/vfs_default.c | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c
index 8d592bbad64..ea036b24ddf 100644
--- a/source3/modules/vfs_default.c
+++ b/source3/modules/vfs_default.c
@@ -476,10 +476,17 @@ static NTSTATUS vfswrap_read_dfs_pathat(struct vfs_handle_struct *handle,
status = NT_STATUS_OBJECT_TYPE_MISMATCH;
} else {
status = map_nt_error_from_unix(errno);
- DBG_ERR("Error reading "
- "msdfs link %s: %s\n",
- smb_fname->base_name,
- strerror(errno));
+ if (errno == ENOENT) {
+ DBG_NOTICE("Error reading "
+ "msdfs link %s: %s\n",
+ smb_fname->base_name,
+ strerror(errno));
+ } else {
+ DBG_ERR("Error reading "
+ "msdfs link %s: %s\n",
+ smb_fname->base_name,
+ strerror(errno));
+ }
}
goto err;
}
--
2.31.1

View File

@ -108,7 +108,7 @@
%define samba_requires_eq() %(LC_ALL="C" echo '%*' | xargs -r rpm -q --qf 'Requires: %%{name} = %%{epoch}:%%{version}\\n' | sed -e 's/ (none):/ /' -e 's/ 0:/ /' | grep -v "is not")
%global baserelease 0
%global baserelease 2
%global samba_version 4.14.5
%global talloc_version 2.3.2
@ -177,6 +177,8 @@ Source14: samba.pamd
Source201: README.downgrade
Patch0: samba-4.14-raise-dfs-enoent-debug-level.patch
Requires(pre): /usr/sbin/groupadd
Requires(post): systemd
Requires(preun): systemd
@ -553,6 +555,20 @@ Samba VFS module for Ceph distributed storage system integration.
#endif with vfs_cephfs
%endif
### IOURING
%if %{with vfs_io_uring}
%package vfs-iouring
Summary: Samba VFS module for io_uring
Requires: %{name} = %{samba_depver}
Requires: %{name}-libs = %{samba_depver}
Provides: bundled(libreplace)
%description vfs-iouring
Samba VFS module for io_uring instance integration.
#endif with vfs_io_uring
%endif
### GLUSTER
%if %{with vfs_glusterfs}
%package vfs-glusterfs
@ -1473,9 +1489,6 @@ fi
%{_libdir}/samba/vfs/full_audit.so
%{_libdir}/samba/vfs/gpfs.so
%{_libdir}/samba/vfs/glusterfs_fuse.so
%if %{with vfs_io_uring}
%{_libdir}/samba/vfs/io_uring.so
%endif
%{_libdir}/samba/vfs/linux_xfs_sgid.so
%{_libdir}/samba/vfs/media_harmony.so
%{_libdir}/samba/vfs/offline.so
@ -1533,9 +1546,6 @@ fi
%{_mandir}/man8/vfs_full_audit.8*
%{_mandir}/man8/vfs_gpfs.8*
%{_mandir}/man8/vfs_glusterfs_fuse.8*
%if %{with vfs_io_uring}
%{_mandir}/man8/vfs_io_uring.8*
%endif
%{_mandir}/man8/vfs_linux_xfs_sgid.8*
%{_mandir}/man8/vfs_media_harmony.8*
%{_mandir}/man8/vfs_offline.8*
@ -2095,6 +2105,13 @@ fi
%{_mandir}/man8/vfs_ceph_snapshots.8*
%endif
### VFS-IOURING
%if %{with vfs_io_uring}
%files vfs-iouring
%{_libdir}/samba/vfs/io_uring.so
%{_mandir}/man8/vfs_io_uring.8*
%endif
### VFS-GLUSTERFS
%if %{with vfs_glusterfs}
%files vfs-glusterfs
@ -3891,6 +3908,13 @@ fi
%endif
%changelog
* Tue Jul 13 2021 Andreas Schneider <asn@redhat.com> - 4.14.4-2
- related: rhbz#1980346 - Rebuild for libtalloc 0.11.0
* Thu Jun 24 2021 Andreas Schneider <asn@redhat.com> - 4.14.4-1
- resolves: rhbz#1974792 - Create a subpackage for vfs-io-uring
- resolves: rhbz#1965397 - Raise log level for dfs ENOENT debug message
* Thu Jun 10 2021 Andreas Schneider <asn@redhat.com> - 4.14.4-0
- related: rhbz#1944657 - Update to version 4.14.5
- resolves: rhbz#1969787 - Fix memory leak in RPC server