[SCM] Samba Shared Repository - branch master updated
Jeremy Allison
jra at samba.org
Fri Sep 8 04:27:03 UTC 2017
The branch, master has been updated
via 13971ba smbd: add missing newline to debug message in daemon_status()
via 47b4fca s3-lib: Fix error mapping for EROFS
from c938f61 python: Allow debug classes to be specified on the command line for python tools
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 13971ba02e00f2e74fd132e7421421eb1aa2d8b8
Author: Justin Maggard via samba-technical <samba-technical at lists.samba.org>
Date: Thu Sep 7 11:05:45 2017 -0700
smbd: add missing newline to debug message in daemon_status()
Signed-off-by: Justin Maggard <jmaggard at netgear.com>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
Autobuild-User(master): Jeremy Allison <jra at samba.org>
Autobuild-Date(master): Fri Sep 8 06:26:52 CEST 2017 on sn-devel-144
commit 47b4fcab1636e51ab9477f9e89153500c774c74f
Author: Sachin Prabhu via samba-technical <samba-technical at lists.samba.org>
Date: Thu Sep 7 12:49:49 2017 +0100
s3-lib: Fix error mapping for EROFS
EROFS is incorrectly mapped to NT_STATUS_ACCESS_DENIED. This should
instead be mapped to NT_STATUS_MEDIA_WRITE_PROTECTED.
This change has already been done for the client in
unix_nt_errmap in libcli/util/errmap_unix.c
commit 9d055846f225 ("r3278: - rewrote the client side rpc...)")
SMB1 specs for SMB_COM_DELETE also specifies this mapping for EROFS
https://msdn.microsoft.com/en-us/library/ee441772.aspx
RH bz: 1171705
This problem was reported by Red Hat glusterfs QE who encountered
different errors when performing the same operation on a fuse mount and
on a cifs mount of the same underlying gluster filesystem.
Signed-off-by: Sachin Prabhu <sprabhu at redhat.com>
Reviewed-by: Gunther Deschner <gdeschne at redhat.com>
Reported-by: Surabhi Bhalothia <sbhaloth at redhat.com>
Reviewed-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
-----------------------------------------------------------------------
Summary of changes:
lib/util/become_daemon.c | 2 +-
source3/lib/errmap_unix.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/util/become_daemon.c b/lib/util/become_daemon.c
index 22c1778..232eda6 100644
--- a/lib/util/become_daemon.c
+++ b/lib/util/become_daemon.c
@@ -146,5 +146,5 @@ void daemon_status(const char *daemon, const char *msg)
#if defined(HAVE_LIBSYSTEMD_DAEMON) || defined(HAVE_LIBSYSTEMD)
sd_notifyf(0, "\nSTATUS=%s: %s", daemon, msg);
#endif
- DBG_ERR("STATUS=daemon '%s' : %s", daemon, msg);
+ DBG_ERR("STATUS=daemon '%s' : %s\n", daemon, msg);
}
diff --git a/source3/lib/errmap_unix.c b/source3/lib/errmap_unix.c
index f572b99..9eb30f7 100644
--- a/source3/lib/errmap_unix.c
+++ b/source3/lib/errmap_unix.c
@@ -71,7 +71,7 @@ static const struct {
{ EXDEV, NT_STATUS_NOT_SAME_DEVICE },
#endif
#ifdef EROFS
- { EROFS, NT_STATUS_ACCESS_DENIED },
+ { EROFS, NT_STATUS_MEDIA_WRITE_PROTECTED },
#endif
#ifdef ENAMETOOLONG
{ ENAMETOOLONG, NT_STATUS_OBJECT_NAME_INVALID },
--
Samba Shared Repository
More information about the samba-cvs
mailing list