[SCM] Samba Shared Repository - branch master updated
Jeremy Allison
jra at samba.org
Wed Feb 26 00:51:02 UTC 2020
The branch, master has been updated
via c3242b4dfc8 libsmb: Fill in device which we don't get from cli_posix_stat
via 51551e0d53f libsmb: Pass the correct path to cli_posix_stat()
from 5076e28aec0 selftest: Slightly simplify setting up libsmbclient tests
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit c3242b4dfc8247e7ef41fc07e40d88fdc4963898
Author: Volker Lendecke <vl at samba.org>
Date: Mon Feb 24 09:43:12 2020 -0800
libsmb: Fill in device which we don't get from cli_posix_stat
SMB1 unix extensions don't carry st_dev for stat
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14101
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
Autobuild-User(master): Jeremy Allison <jra at samba.org>
Autobuild-Date(master): Wed Feb 26 00:50:32 UTC 2020 on sn-devel-184
commit 51551e0d53fa6abf2c7036ec8a8758f68249b5da
Author: Volker Lendecke <vl at samba.org>
Date: Mon Feb 24 09:42:46 2020 -0800
libsmb: Pass the correct path to cli_posix_stat()
This fixes doing strlen() on talloc_tos(), about which valgrind is pretty
unhappy. Without this patch we survive the tests because we have fallbacks to
the non-posix flavors of stat(). With this patch in place cli_posix_stat()
becomes functional in this code path. This creates conflicts with the readdir
libsmbclient tests, which need fixing separately.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14101
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
-----------------------------------------------------------------------
Summary of changes:
selftest/knownfail.d/libsmbclient | 2 ++
source3/libsmb/libsmb_file.c | 3 ++-
2 files changed, 4 insertions(+), 1 deletion(-)
create mode 100644 selftest/knownfail.d/libsmbclient
Changeset truncated at 500 lines:
diff --git a/selftest/knownfail.d/libsmbclient b/selftest/knownfail.d/libsmbclient
new file mode 100644
index 00000000000..dddd6d24920
--- /dev/null
+++ b/selftest/knownfail.d/libsmbclient
@@ -0,0 +1,2 @@
+samba4.libsmbclient.readdirplus2.NT1.readdirplus2.*
+samba4.libsmbclient.readdirplus_seek.NT1.readdirplus_seek.*
diff --git a/source3/libsmb/libsmb_file.c b/source3/libsmb/libsmb_file.c
index 852c3952e1b..a1ae4584d15 100644
--- a/source3/libsmb/libsmb_file.c
+++ b/source3/libsmb/libsmb_file.c
@@ -503,8 +503,9 @@ SMBC_getatr(SMBCCTX * context,
if (srv->try_posixinfo) {
SMB_STRUCT_STAT sbuf;
- status = cli_posix_stat(targetcli, frame, &sbuf);
+ status = cli_posix_stat(targetcli, targetpath, &sbuf);
if (NT_STATUS_IS_OK(status)) {
+ sbuf.st_ex_dev = srv->dev;
setup_stat_from_stat_ex(&sbuf, path, sb);
TALLOC_FREE(frame);
--
Samba Shared Repository
More information about the samba-cvs
mailing list