[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  8a0a7359fab s3: smbd: Quiet log messages from usershares for an unknown share.
      from  936f74daed0 vfs_zfsacl: add missing inherited flag on hidden "magic" everyone@ ACE

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 8a0a7359faba642baf55a8f98ff78c0d0884d0f0
Author: Jeremy Allison <jra at 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 <jra at samba.org>
    Reviewed-by: Rowland penny <rpenny at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Fri Dec  4 20:54:06 UTC 2020 on sn-devel-184

-----------------------------------------------------------------------

Summary of changes:
 source3/param/loadparm.c | 10 ++++++++++
 1 file changed, 10 insertions(+)


Changeset truncated at 500 lines:

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index fbeed6782ad..3de22b350f1 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -3424,6 +3424,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;
@@ -3629,6 +3634,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