The branch, v4-13-test has been updated via 54d3d3cbf49 s3: smbd: Quiet log messages from usershares for an unknown share. via f7490ec9d94 s3-libads: Pass timeout to open_socket_out in ms from 585c49f21f7 vfs_glusterfs: print exact cmdline for disabling write-behind translator
https://git.samba.org/?p=samba.git;a=shortlog;h=v4-13-test - Log ----------------------------------------------------------------- commit 54d3d3cbf49b660f7e93aa45caa94fa6821c0999 Author: Jeremy Allison <j...@samba.org> Date: Wed Dec 2 11:47:02 2020 -0800 s3: smbd: Quiet log messages from usershares for an unknown share. No need to log missing shares/sharenames at debug level zero. Keep the debug level zero for all other usershare problems. BUG: https://bugzilla.samba.org/show_bug.cgi?id=14590 Signed-off-by: Jeremy Allison <j...@samba.org> Reviewed-by: Rowland penny <rpe...@samba.org> Reviewed-by: Andrew Bartlett <abart...@samba.org> Autobuild-User(master): Jeremy Allison <j...@samba.org> Autobuild-Date(master): Fri Dec 4 20:54:06 UTC 2020 on sn-devel-184 (cherry picked from commit 8a0a7359faba642baf55a8f98ff78c0d0884d0f0) Autobuild-User(v4-13-test): Karolin Seeger <ksee...@samba.org> Autobuild-Date(v4-13-test): Tue Dec 8 10:21:11 UTC 2020 on sn-devel-184 commit f7490ec9d94edfc9cdc79e70580b3b226a2022d5 Author: Isaac Boukris <ibouk...@gmail.com> Date: Tue Jul 14 22:38:06 2020 +0200 s3-libads: Pass timeout to open_socket_out in ms BUG: https://bugzilla.samba.org/show_bug.cgi?id=13124 Signed-off-by: Isaac Boukris <ibouk...@samba.org> Reviewed-by: Andreas Schneider <a...@samba.org> Autobuild-User(master): Andreas Schneider <a...@cryptomilk.org> Autobuild-Date(master): Thu Jul 16 10:41:40 UTC 2020 on sn-devel-184 (cherry picked from commit d67e9149a612044e247e7a4d78913ecf396c69fc) ----------------------------------------------------------------------- Summary of changes: source3/libads/ldap.c | 4 +++- source3/param/loadparm.c | 10 ++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) Changeset truncated at 500 lines: diff --git a/source3/libads/ldap.c b/source3/libads/ldap.c index 10ab043f721..ee4628a09a2 100755 --- a/source3/libads/ldap.c +++ b/source3/libads/ldap.c @@ -96,9 +96,11 @@ static void gotalarm_sig(int signum) { int fd = -1; NTSTATUS status = NT_STATUS_UNSUCCESSFUL; + unsigned timeout_ms = 1000 * to; - status = open_socket_out(ss, port, to, &fd); + status = open_socket_out(ss, port, timeout_ms, &fd); if (!NT_STATUS_IS_OK(status)) { + DEBUG(3, ("open_socket_out: failed to open socket\n")); return NULL; } diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 6674485738a..a3abaa2ec67 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -3418,6 +3418,11 @@ static int process_usershare_file(const char *dir_name, const char *file_name, i open and fstat. Ensure this isn't a symlink link. */ if (sys_lstat(fname, &lsbuf, false) != 0) { + if (errno == ENOENT) { + /* Unknown share requested. Just ignore. */ + goto out; + } + /* Only log messages for meaningful problems. */ DEBUG(0,("process_usershare_file: stat of %s failed. %s\n", fname, strerror(errno) )); goto out; @@ -3623,6 +3628,11 @@ int load_usershare_service(const char *servicename) int max_user_shares = Globals.usershare_max_shares; int snum_template = -1; + if (servicename[0] == '\0') { + /* Invalid service name. */ + return -1; + } + if (*usersharepath == 0 || max_user_shares == 0) { return -1; } -- Samba Shared Repository