[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 420bbb1d92f wafsamba: require PYTHONHASHSEED=1 to be exported via aa02cf3c444 ctdb/packaging/RPM: don't use waf directly via 22c46d9f418 configure/Makefile: export PYTHONHASHSEED=1 in all 'configure/Makefile' scripts via a6b1e4b5766 wafsamba: let test_duplicate_symbol.sh export PYTHONHASHSEED=1 via 0be4f567233 s4:selftest/provisions: make use of 'make testenv' and avoid direct waf via 10d69da1d34 lib/fuzzing/README.md: don't use waf directly via 42eeed05f1a buildtools: remove unused testwaf.sh from 825dcc6a13d smbd: Don't NULL out "::$DATA" https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 420bbb1d92fd2a28725b53f425ba3d214831b660 Author: Stefan Metzmacher Date: Mon Mar 28 13:00:03 2022 +0200 wafsamba: require PYTHONHASHSEED=1 to be exported This avoids a lot of trouble with random build failures, if people try to use waf directly. Signed-off-by: Stefan Metzmacher Reviewed-by: Andrew Bartlett Autobuild-User(master): Andrew Bartlett Autobuild-Date(master): Tue Mar 29 23:31:38 UTC 2022 on sn-devel-184 commit aa02cf3c4449cb0a22da8f359f0b3edc4f1d9bb7 Author: Stefan Metzmacher Date: Mon Mar 28 12:38:36 2022 +0200 ctdb/packaging/RPM: don't use waf directly ./configure && make && make install is will always work. Signed-off-by: Stefan Metzmacher Reviewed-by: Andrew Bartlett commit 22c46d9f41876d9ec7187148e658d1692bf37cdd Author: Stefan Metzmacher Date: Mon Mar 28 12:59:12 2022 +0200 configure/Makefile: export PYTHONHASHSEED=1 in all 'configure/Makefile' scripts Signed-off-by: Stefan Metzmacher Reviewed-by: Andrew Bartlett commit a6b1e4b5766205b7337e0e4b00944184289bfc36 Author: Stefan Metzmacher Date: Mon Mar 28 12:50:55 2022 +0200 wafsamba: let test_duplicate_symbol.sh export PYTHONHASHSEED=1 Signed-off-by: Stefan Metzmacher Reviewed-by: Andrew Bartlett commit 0be4f5672338802042b06308c5cf0ea04bcaf48e Author: Stefan Metzmacher Date: Mon Mar 28 12:49:50 2022 +0200 s4:selftest/provisions: make use of 'make testenv' and avoid direct waf Signed-off-by: Stefan Metzmacher Reviewed-by: Andrew Bartlett commit 10d69da1d34b2b11920d9bf051f5a26dbbcadf02 Author: Stefan Metzmacher Date: Mon Mar 28 12:49:24 2022 +0200 lib/fuzzing/README.md: don't use waf directly Signed-off-by: Stefan Metzmacher Reviewed-by: Andrew Bartlett commit 42eeed05f1aed10b48f7008a18e47cf15ac2c010 Author: Stefan Metzmacher Date: Mon Mar 28 12:38:02 2022 +0200 buildtools: remove unused testwaf.sh Signed-off-by: Stefan Metzmacher Reviewed-by: Andrew Bartlett --- Summary of changes: buildtools/scripts/Makefile.waf| 4 +- buildtools/scripts/configure.waf | 11 +++- buildtools/testwaf.sh | 70 -- buildtools/wafsamba/test_duplicate_symbol.sh | 3 + buildtools/wafsamba/wscript| 4 ++ configure | 4 ++ ctdb/Makefile | 2 +- ctdb/configure | 7 +++ ctdb/packaging/RPM/ctdb.spec.in| 6 +- lib/fuzzing/README.md | 12 ++-- lib/ldb/configure | 7 +++ lib/replace/configure | 7 +++ lib/talloc/configure | 7 +++ lib/tdb/configure | 7 +++ lib/tevent/configure | 7 +++ .../release-4-1-0rc3/steps-to-reproduce.txt| 2 +- 16 files changed, 75 insertions(+), 85 deletions(-) delete mode 100755 buildtools/testwaf.sh Changeset truncated at 500 lines: diff --git a/buildtools/scripts/Makefile.waf b/buildtools/scripts/Makefile.waf index 5fc939c99e0..a15a5f87607 100644 --- a/buildtools/scripts/Makefile.waf +++ b/buildtools/scripts/Makefile.waf @@ -1,7 +1,7 @@ # simple makefile wrapper to run waf -WAF_BINARY=BUILDTOOLS/bin/waf -WAF=WAF_MAKE=1 $(WAF_BINARY) +WAF_BINARY=$(PYTHON) BUILDTOOLS/bin/waf +WAF=PYTHONHASHSEED=1 WAF_MAKE=1 $(WAF_BINARY) all: $(WAF) build diff --git a/buildtools/scripts/configure.waf b/buildtools/scripts/configure.waf index a7d8d1dbd64..ccb62849a54 100755 --- a/buildtools/scripts/configure.waf +++ b/buildtools/scripts/configure.waf @@ -1,6 +1,6 @@ #!/bin/sh -PREVPATH=`dirname $0` +PREVPATH=$(dirname $0) WAF=BUILDTOOLS/bin/waf @@ -9,6 +9,13 @@ WAF=BUILDTOOLS/bin/waf JOBS=1 export JOBS +# Make sure we don't have any library preloaded. +unset LD_PRELOAD + +# Make sure we get stable hashes +PYTHONHASHSEED=1 +export PYTHONHASHSEED
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 825dcc6a13d smbd: Don't NULL out "::$DATA"
via e41f8001f1a smbd: Don't NULL out the "::$DATA" in
openat_pathref_fsp()
via 50bac24665b smbd: Simplify reply_rmdir()
via 103dc3f938d smbd: Add a DEBUG to create_file_unixpath()
via af1719a92b4 smbd: Fix create_file_unixpath()'s stream handling
via 91ac9ce0d1e lib: GENCACHE_RAM isn't used anymore
via 1f78a8e32f0 smbd: Fix a typo
from d7a91a855c7 s4-auth: Remove last traces of LanMan authentiation
support in the AD DC.
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 825dcc6a13dcce5c9eced1baef9a92bd9f6d4d84
Author: Volker Lendecke
Date: Fri Feb 11 16:59:30 2022 +0100
smbd: Don't NULL out "::$DATA"
Slight simplification now possible after introducing and using
fsp_is_alternate_stream() almost everywhere.
Signed-off-by: Volker Lendecke
Reviewed-by: Jeremy Allison
Autobuild-User(master): Jeremy Allison
Autobuild-Date(master): Tue Mar 29 22:24:38 UTC 2022 on sn-devel-184
commit e41f8001f1a1b7d9764c34f201726aae837f23dc
Author: Volker Lendecke
Date: Fri Feb 11 11:12:31 2022 +0100
smbd: Don't NULL out the "::$DATA" in openat_pathref_fsp()
Slight simplification now possible after introducing and using
fsp_is_alternate_stream() almost everywhere.
Signed-off-by: Volker Lendecke
Reviewed-by: Jeremy Allison
commit 50bac24665ba858edc2e6a3e66422b6eee4cdd39
Author: Volker Lendecke
Date: Mon Mar 28 16:49:25 2022 +0200
smbd: Simplify reply_rmdir()
We don't need to check this here, create_file_default and callees take
care of this.
Signed-off-by: Volker Lendecke
Reviewed-by: Jeremy Allison
commit 103dc3f938d65ae6a59bc77825c185fb87046b7a
Author: Volker Lendecke
Date: Mon Mar 28 16:49:04 2022 +0200
smbd: Add a DEBUG to create_file_unixpath()
Signed-off-by: Volker Lendecke
Reviewed-by: Jeremy Allison
commit af1719a92b4ec2d519515acd7d8166454bcae78f
Author: Volker Lendecke
Date: Mon Mar 28 15:11:48 2022 +0200
smbd: Fix create_file_unixpath()'s stream handling
Make create_file_unixpath() robust against callers explicitly passing
in ":$DATA" as a stream name indicating the default stream. Right now
we NULL this out in callers, but this might change in the future.
Signed-off-by: Volker Lendecke
Reviewed-by: Jeremy Allison
commit 91ac9ce0d1e2b12da799ab83ee53ed2bc48097dd
Author: Volker Lendecke
Date: Fri Mar 25 15:18:44 2022 +0100
lib: GENCACHE_RAM isn't used anymore
Signed-off-by: Volker Lendecke
Reviewed-by: Jeremy Allison
commit 1f78a8e32f05870fdab6209cb20b50e7e1f223e9
Author: Volker Lendecke
Date: Thu Mar 24 15:43:53 2022 +0100
smbd: Fix a typo
Signed-off-by: Volker Lendecke
Reviewed-by: Jeremy Allison
---
Summary of changes:
lib/util/memcache.h| 1 -
source3/smbd/files.c | 4
source3/smbd/nttrans.c | 2 +-
source3/smbd/open.c| 4 ++--
source3/smbd/reply.c | 5 -
5 files changed, 3 insertions(+), 13 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/util/memcache.h b/lib/util/memcache.h
index 4331c2f1465..1ba4d5ac2f8 100644
--- a/lib/util/memcache.h
+++ b/lib/util/memcache.h
@@ -36,7 +36,6 @@ struct memcache;
enum memcache_number {
STAT_CACHE,
- GENCACHE_RAM,
GETWD_CACHE,
GETPWNAM_CACHE, /* talloc */
MANGLE_HASH2_CACHE,
diff --git a/source3/smbd/files.c b/source3/smbd/files.c
index 51ad489ef16..2e513dd6299 100644
--- a/source3/smbd/files.c
+++ b/source3/smbd/files.c
@@ -469,10 +469,6 @@ NTSTATUS openat_pathref_fsp(const struct files_struct
*dirfsp,
goto fail;
}
- if (is_ntfs_default_stream_smb_fname(full_fname)) {
- full_fname->stream_name = NULL;
- }
-
status = fsp_attach_smb_fname(fsp, _fname);
if (!NT_STATUS_IS_OK(status)) {
goto fail;
diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c
index 55331d1451b..ad361d63b08 100644
--- a/source3/smbd/nttrans.c
+++ b/source3/smbd/nttrans.c
@@ -1309,7 +1309,7 @@ static void call_nt_transact_create(connection_struct
*conn,
ea_list_has_invalid_name(ea_list)) {
/* Realloc the size of parameters and data we will
return */
if (flags & EXTENDED_RESPONSE_REQUIRED) {
- /* Extended response is 32 more byyes. */
+ /* Extended response is 32 more bytes. */
param_len = 101;
} else {
param_len = 69;
diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index
[SCM] Samba Shared Repository - branch v4-16-test updated
The branch, v4-16-test has been updated via ac73a58d751 builtools: Make abi_gen.sh less prone to errors from 15035d82a58 vfs_shadow_copy2: remove async getxattrat https://git.samba.org/?p=samba.git;a=shortlog;h=v4-16-test - Log - commit ac73a58d75183cd479326ca4b1a1e58cca3e0466 Author: Andreas Schneider Date: Mon Feb 14 07:59:52 2022 +0100 builtools: Make abi_gen.sh less prone to errors The mold linker has more hidden symbols and we would need to filter them out with nm, where objdump tells us which symbols are actually hidden. So we just need to filter out whatever is hidden. The use of awk makes it also easier to get what we want. Signed-off-by: Andreas Schneider Reviewed-by: Alexander Bokovoy (cherry picked from commit 2b9917d7a3cb88cf48517e4a93a94fa3ca6ff3d9) Autobuild-User(v4-16-test): Jule Anger Autobuild-Date(v4-16-test): Tue Mar 29 16:07:13 UTC 2022 on sn-devel-184 --- Summary of changes: buildtools/scripts/abi_gen.sh | 9 +++-- 1 file changed, 7 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/buildtools/scripts/abi_gen.sh b/buildtools/scripts/abi_gen.sh index 6dd6d321f77..ddb0a7cc36f 100755 --- a/buildtools/scripts/abi_gen.sh +++ b/buildtools/scripts/abi_gen.sh @@ -10,9 +10,14 @@ cat < $GDBSCRIPT -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v4-16-test updated
The branch, v4-16-test has been updated via 15035d82a58 vfs_shadow_copy2: remove async getxattrat via e644e783060 CI: add a test for async dosmode on a file in a shadow_copy2 snapshot via d67d5bd74f0 CI: enable "smbd async dosmode" on shadow_write share via de314f93375 smbd: also check for NT_STATUS_NOT_SUPPORTED via 310e334a59e CI: add test "smb2.async_dosmode" via 16be7d70450 smbd: check "store dos attributes" settings in the async dosmode code via 84504306f1d CI: remove shares referencing removed functionality via 337301252b6 waf: Document the confusing --nonshared-binary, --builtin-libraries, --private-libraries and --bundled-libraries from 7676cb51450 s3: smbd: Don't allow setting the delete on close bit on a directory if it contains non-visible files and "delete veto files = no". https://git.samba.org/?p=samba.git;a=shortlog;h=v4-16-test - Log - commit 15035d82a58821d1f54291a111e8a43a9ad3b82e Author: Ralph Boehme Date: Wed Feb 23 11:36:29 2022 +0100 vfs_shadow_copy2: remove async getxattrat vfswrap_getxattrat_send() is handle based using smb_fname->fsp. As the open of smb_fname->fsp was processed by this module, the handle is already correctly opened on the file in the snapshot. In the end this means we can just call directly call the next function here. Note that the same reasoning might apply to other modules that use vfs_not_implemented_getxattrat_send(), but checking and adjusting those is a job for another day. Currently they will continue to go via the sync fallback of the caller. Signed-off-by: Ralph Boehme Reviewed-by: Jeremy Allison Autobuild-User(master): Jeremy Allison Autobuild-Date(master): Mon Feb 28 20:53:35 UTC 2022 on sn-devel-184 (cherry picked from commit afc2103da0fe947afc027b3e25c5e82aa5d3f1fb) Autobuild-User(v4-16-test): Jule Anger Autobuild-Date(v4-16-test): Tue Mar 29 10:21:03 UTC 2022 on sn-devel-184 commit e644e783060fc44082f683a7d36384173a79e899 Author: Ralph Boehme Date: Wed Feb 23 18:10:59 2022 +0100 CI: add a test for async dosmode on a file in a shadow_copy2 snapshot Signed-off-by: Ralph Boehme Reviewed-by: Jeremy Allison (cherry picked from commit 1097b1d0776661d873861672ca38e5892014725d) commit d67d5bd74f0715fe8e5684aa655c4863b1558936 Author: Ralph Boehme Date: Wed Feb 23 18:14:38 2022 +0100 CI: enable "smbd async dosmode" on shadow_write share Existing tests don't care, upcoming new test needs it. Signed-off-by: Ralph Boehme Reviewed-by: Jeremy Allison (cherry picked from commit 48f81b4e7216e4dad0a86aca75890c32117a342e) commit de314f9337547bf26dbb10268ce455e9a6bcc8da Author: Ralph Boehme Date: Fri Dec 17 15:02:06 2021 +0100 smbd: also check for NT_STATUS_NOT_SUPPORTED If a VFS module fails SMB_VFS_GETXATTRAT_SEND/RECV with ENOSYS like currently vfs_shadow_copy2 or any other module that uses vfs_not_implemented_getxattrat_send() the ENOSYS error that vfs_not_implemented_getxattrat_send() sets gets mapped to NT_STATUS_NOT_SUPPORTED by map_nt_error_from_unix(). Unfortunately when checking whether the async SMB_VFS_GETXATTRAT_SEND() failed and to determine if the sync fallback should be triggered, we currently only check for NT_STATUS_NOT_IMPLEMENTED which is the error we get when "store dos attributes" is disabled. BUG: https://bugzilla.samba.org/show_bug.cgi?id=14957 Signed-off-by: Ralph Boehme Reviewed-by: Jeremy Allison (cherry picked from commit 97caec07ffd18f247134d21c3ba07c31591863bc) commit 310e334a59e8ddbaa2ad661ea709bdb77db35d2f Author: Ralph Boehme Date: Tue Jan 25 17:59:37 2022 +0100 CI: add test "smb2.async_dosmode" Verifies async-dosmode sync fallback works with shadow_copy2 which returns ENOSYS for SMB_VFS_GET_DOS_ATTRIBUTES_SEND(). BUG: https://bugzilla.samba.org/show_bug.cgi?id=14957 Signed-off-by: Ralph Boehme Reviewed-by: Jeremy Allison (cherry picked from commit ffdb1c3e00c233efc99e8f1a66a5f83beb4e07f3) commit 16be7d70450b234daebdfd2dc4813655d73e547c Author: Ralph Boehme Date: Mon Jan 24 16:45:11 2022 +0100 smbd: check "store dos attributes" settings in the async dosmode code BUG: https://bugzilla.samba.org/show_bug.cgi?id=14957 Signed-off-by: Ralph Boehme Reviewed-by: Jeremy Allison (cherry picked from commit ecf56c1d9b6b898ed4060e3bba341392ddcc9b5a) commit 84504306f1df79a08e5efe0839800a121988 Author: Ralph Boehme Date: Mon Jan 24 16:54:29 2022 +0100 CI: remove shares referencing removed functionality The whole "smbd:force sync [user|root] [path|chdir] safe threadpool" stuff was removed long ago by 29dd6f3e59055a17fa3d6a63619773f940e63374.
[SCM] Samba Shared Repository - branch v4-15-test updated
The branch, v4-15-test has been updated via 2f5c7c5621c vfs_shadow_copy2: remove async getxattrat via d50307e09b9 CI: add a test for async dosmode on a file in a shadow_copy2 snapshot via 10b6c5bd6be CI: enable "smbd async dosmode" on shadow_write share via c4d8a5a43f2 smbd: also check for NT_STATUS_NOT_SUPPORTED via f6b1d19ecbc CI: add test "smb2.async_dosmode" via bf34d2fb5f3 smbd: check "store dos attributes" settings in the async dosmode code via f0fb1f51873 CI: remove shares referencing removed functionality via 77352e08d77 s4:kdc: strictly have 2 16-bit parts in krbtgt kvnos from f2e124e423c s3: smbd: Don't allow setting the delete on close bit on a directory if it contains non-visible files and "delete veto files = no". https://git.samba.org/?p=samba.git;a=shortlog;h=v4-15-test - Log - commit 2f5c7c5621c48b42844bfb0aebdfbb417dfc5aaa Author: Ralph Boehme Date: Wed Feb 23 11:36:29 2022 +0100 vfs_shadow_copy2: remove async getxattrat vfswrap_getxattrat_send() is handle based using smb_fname->fsp. As the open of smb_fname->fsp was processed by this module, the handle is already correctly opened on the file in the snapshot. In the end this means we can just call directly call the next function here. Note that the same reasoning might apply to other modules that use vfs_not_implemented_getxattrat_send(), but checking and adjusting those is a job for another day. Currently they will continue to go via the sync fallback of the caller. Signed-off-by: Ralph Boehme Reviewed-by: Jeremy Allison Autobuild-User(master): Jeremy Allison Autobuild-Date(master): Mon Feb 28 20:53:35 UTC 2022 on sn-devel-184 (cherry picked from commit afc2103da0fe947afc027b3e25c5e82aa5d3f1fb) Autobuild-User(v4-15-test): Jule Anger Autobuild-Date(v4-15-test): Tue Mar 29 09:08:10 UTC 2022 on sn-devel-184 commit d50307e09b9caa133a2d17ad7227612815181fcd Author: Ralph Boehme Date: Wed Feb 23 18:10:59 2022 +0100 CI: add a test for async dosmode on a file in a shadow_copy2 snapshot Signed-off-by: Ralph Boehme Reviewed-by: Jeremy Allison (cherry picked from commit 1097b1d0776661d873861672ca38e5892014725d) commit 10b6c5bd6be0fdea057d0e69306c0ee5fb3187c7 Author: Ralph Boehme Date: Wed Feb 23 18:14:38 2022 +0100 CI: enable "smbd async dosmode" on shadow_write share Existing tests don't care, upcoming new test needs it. Signed-off-by: Ralph Boehme Reviewed-by: Jeremy Allison (cherry picked from commit 48f81b4e7216e4dad0a86aca75890c32117a342e) commit c4d8a5a43f26be7d37f6452ce2f51a5b70f0a6e7 Author: Ralph Boehme Date: Fri Dec 17 15:02:06 2021 +0100 smbd: also check for NT_STATUS_NOT_SUPPORTED If a VFS module fails SMB_VFS_GETXATTRAT_SEND/RECV with ENOSYS like currently vfs_shadow_copy2 or any other module that uses vfs_not_implemented_getxattrat_send() the ENOSYS error that vfs_not_implemented_getxattrat_send() sets gets mapped to NT_STATUS_NOT_SUPPORTED by map_nt_error_from_unix(). Unfortunately when checking whether the async SMB_VFS_GETXATTRAT_SEND() failed and to determine if the sync fallback should be triggered, we currently only check for NT_STATUS_NOT_IMPLEMENTED which is the error we get when "store dos attributes" is disabled. BUG: https://bugzilla.samba.org/show_bug.cgi?id=14957 Signed-off-by: Ralph Boehme Reviewed-by: Jeremy Allison (cherry picked from commit 97caec07ffd18f247134d21c3ba07c31591863bc) commit f6b1d19ecbc5e8fe41a4027f5d6418bcb77e4a88 Author: Ralph Boehme Date: Tue Jan 25 17:59:37 2022 +0100 CI: add test "smb2.async_dosmode" Verifies async-dosmode sync fallback works with shadow_copy2 which returns ENOSYS for SMB_VFS_GET_DOS_ATTRIBUTES_SEND(). BUG: https://bugzilla.samba.org/show_bug.cgi?id=14957 Signed-off-by: Ralph Boehme Reviewed-by: Jeremy Allison (cherry picked from commit ffdb1c3e00c233efc99e8f1a66a5f83beb4e07f3) commit bf34d2fb5f34afb3ecbd64f8a7f9e6e51e7ed23e Author: Ralph Boehme Date: Mon Jan 24 16:45:11 2022 +0100 smbd: check "store dos attributes" settings in the async dosmode code BUG: https://bugzilla.samba.org/show_bug.cgi?id=14957 Signed-off-by: Ralph Boehme Reviewed-by: Jeremy Allison (cherry picked from commit ecf56c1d9b6b898ed4060e3bba341392ddcc9b5a) commit f0fb1f5187366d0fe2905fed62e621d3072e4dda Author: Ralph Boehme Date: Mon Jan 24 16:54:29 2022 +0100 CI: remove shares referencing removed functionality The whole "smbd:force sync [user|root] [path|chdir] safe threadpool" stuff was removed long ago by 29dd6f3e59055a17fa3d6a63619773f940e63374. BUG: https://bugzilla.samba.org/show_bug.cgi?id=14957
