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 <v...@samba.org> 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 <v...@samba.org> Reviewed-by: Jeremy Allison <j...@samba.org> Autobuild-User(master): Jeremy Allison <j...@samba.org> Autobuild-Date(master): Tue Mar 29 22:24:38 UTC 2022 on sn-devel-184 commit e41f8001f1a1b7d9764c34f201726aae837f23dc Author: Volker Lendecke <v...@samba.org> 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 <v...@samba.org> Reviewed-by: Jeremy Allison <j...@samba.org> commit 50bac24665ba858edc2e6a3e66422b6eee4cdd39 Author: Volker Lendecke <v...@samba.org> 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 <v...@samba.org> Reviewed-by: Jeremy Allison <j...@samba.org> commit 103dc3f938d65ae6a59bc77825c185fb87046b7a Author: Volker Lendecke <v...@samba.org> Date: Mon Mar 28 16:49:04 2022 +0200 smbd: Add a DEBUG to create_file_unixpath() Signed-off-by: Volker Lendecke <v...@samba.org> Reviewed-by: Jeremy Allison <j...@samba.org> commit af1719a92b4ec2d519515acd7d8166454bcae78f Author: Volker Lendecke <v...@samba.org> 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 <v...@samba.org> Reviewed-by: Jeremy Allison <j...@samba.org> commit 91ac9ce0d1e2b12da799ab83ee53ed2bc48097dd Author: Volker Lendecke <v...@samba.org> Date: Fri Mar 25 15:18:44 2022 +0100 lib: GENCACHE_RAM isn't used anymore Signed-off-by: Volker Lendecke <v...@samba.org> Reviewed-by: Jeremy Allison <j...@samba.org> commit 1f78a8e32f05870fdab6209cb20b50e7e1f223e9 Author: Volker Lendecke <v...@samba.org> Date: Thu Mar 24 15:43:53 2022 +0100 smbd: Fix a typo Signed-off-by: Volker Lendecke <v...@samba.org> Reviewed-by: Jeremy Allison <j...@samba.org> ----------------------------------------------------------------------- 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, &full_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 0d64e534149..9e792a23132 100644 --- a/source3/smbd/open.c +++ b/source3/smbd/open.c @@ -5689,7 +5689,7 @@ static NTSTATUS create_file_unixpath(connection_struct *conn, if ((conn->fs_capabilities & FILE_NAMED_STREAMS) && (access_mask & DELETE_ACCESS) - && !is_ntfs_stream_smb_fname(smb_fname)) { + && !is_named_stream(smb_fname)) { /* * We can't open a file with DELETE access if any of the * streams is open without FILE_SHARE_DELETE @@ -5750,6 +5750,7 @@ static NTSTATUS create_file_unixpath(connection_struct *conn, uint32_t base_privflags; if (create_options & FILE_DIRECTORY_FILE) { + DBG_DEBUG("Can't open a stream as directory\n"); status = NT_STATUS_NOT_A_DIRECTORY; goto fail; } @@ -6255,7 +6256,6 @@ NTSTATUS create_file_default(connection_struct *conn, if (is_ntfs_default_stream_smb_fname(smb_fname)) { int ret; - smb_fname->stream_name = NULL; /* We have to handle this error here. */ if (create_options & FILE_DIRECTORY_FILE) { status = NT_STATUS_NOT_A_DIRECTORY; diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c index 1677d997fe9..e7e39fe23ec 100644 --- a/source3/smbd/reply.c +++ b/source3/smbd/reply.c @@ -6873,11 +6873,6 @@ void reply_rmdir(struct smb_request *req) goto out; } - if (is_ntfs_stream_smb_fname(smb_dname)) { - reply_nterror(req, NT_STATUS_NOT_A_DIRECTORY); - goto out; - } - status = SMB_VFS_CREATE_FILE( conn, /* conn */ req, /* req */ -- Samba Shared Repository