From: Jeremy Allison <jra@samba.org>
Date: Wed, 2 Dec 2020 19:47:02 +0000 (-0800)
Subject: s3: smbd: Quiet log messages from usershares for an unknown share.
X-Git-Tag: samba-4.12.11~27
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a30aaa499db06023e11aa35cf66b105d1a5b56e4;p=thirdparty%2Fsamba.git

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@samba.org>
Reviewed-by: Rowland penny <rpenny@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Fri Dec  4 20:54:06 UTC 2020 on sn-devel-184

(cherry picked from commit 8a0a7359faba642baf55a8f98ff78c0d0884d0f0)
---

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index d3d81f6ece5..64e7afb5d86 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -3417,6 +3417,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;
@@ -3622,6 +3627,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;
 	}