|
 |
868320 |
From c50d91d16292a13d29b1125c0aa85c7a7963de5f Mon Sep 17 00:00:00 2001
|
|
|
868320 |
From: Andreas Schneider <asn@samba.org>
|
|
|
868320 |
Date: Mon, 27 Jan 2020 14:58:10 +0100
|
|
|
868320 |
Subject: [PATCH] lib:util: Log mkdir error on correct debug levels
|
|
|
868320 |
MIME-Version: 1.0
|
|
|
868320 |
Content-Type: text/plain; charset=UTF-8
|
|
|
868320 |
Content-Transfer-Encoding: 8bit
|
|
|
868320 |
|
|
|
868320 |
For smbd we want an error and for smbclient we only want it in NOTICE
|
|
|
868320 |
debug level.
|
|
|
868320 |
The default log level of smbclient is log level 1 so we need notice to
|
|
|
868320 |
not spam the user.
|
|
|
868320 |
|
|
|
868320 |
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14253
|
|
|
868320 |
|
|
|
868320 |
Signed-off-by: Andreas Schneider <asn@samba.org>
|
|
|
868320 |
Reviewed-by: Guenther Deschner <gd@samba.org>
|
|
|
868320 |
|
|
|
868320 |
Autobuild-User(master): Günther Deschner <gd@samba.org>
|
|
|
868320 |
Autobuild-Date(master): Mon Jan 27 15:55:24 UTC 2020 on sn-devel-184
|
|
|
868320 |
|
|
|
868320 |
(cherry picked from commit 0ad6a243b259d284064c0c5abcc7d430d55be7e1)
|
|
|
868320 |
---
|
|
|
868320 |
lib/util/util.c | 7 +++++--
|
|
|
868320 |
1 file changed, 5 insertions(+), 2 deletions(-)
|
|
|
868320 |
|
|
|
868320 |
diff --git a/lib/util/util.c b/lib/util/util.c
|
|
|
868320 |
index 3bdeded5c1b..0d9ffe5cb7b 100644
|
|
|
868320 |
--- a/lib/util/util.c
|
|
|
868320 |
+++ b/lib/util/util.c
|
|
|
868320 |
@@ -353,9 +353,12 @@ _PUBLIC_ bool directory_create_or_exist(const char *dname,
|
|
|
868320 |
old_umask = umask(0);
|
|
|
868320 |
ret = mkdir(dname, dir_perms);
|
|
|
868320 |
if (ret == -1 && errno != EEXIST) {
|
|
|
868320 |
- DBG_WARNING("mkdir failed on directory %s: %s\n",
|
|
|
868320 |
+ int dbg_level = geteuid() == 0 ? DBGLVL_ERR : DBGLVL_NOTICE;
|
|
|
868320 |
+
|
|
|
868320 |
+ DBG_PREFIX(dbg_level,
|
|
|
868320 |
+ ("mkdir failed on directory %s: %s\n",
|
|
|
868320 |
dname,
|
|
|
868320 |
- strerror(errno));
|
|
|
868320 |
+ strerror(errno)));
|
|
|
868320 |
umask(old_umask);
|
|
|
868320 |
return false;
|
|
|
868320 |
}
|
|
|
868320 |
--
|
|
|
868320 |
2.25.0
|
|
|
868320 |
|