[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 82f021d43de pidl: include scompat headers and servers in s3 server template from 1edf9ecaf56 posix_acls.c: prefer capabilities over become_root https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 82f021d43de1643d06332e152fcaf3e07e51cd1b Author: Günther Deschner Date: Tue Nov 7 01:19:16 2023 +0100 pidl: include scompat headers and servers in s3 server template Guenther Signed-off-by: Guenther Deschner Reviewed-by: Samuel Cabrero Autobuild-User(master): Günther Deschner Autobuild-Date(master): Fri Nov 17 00:39:18 UTC 2023 on atb-devel-224 --- Summary of changes: pidl/lib/Parse/Pidl/Samba3/Template.pm | 7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) Changeset truncated at 500 lines: diff --git a/pidl/lib/Parse/Pidl/Samba3/Template.pm b/pidl/lib/Parse/Pidl/Samba3/Template.pm index ee64aebf365..6c1bbf3725b 100644 --- a/pidl/lib/Parse/Pidl/Samba3/Template.pm +++ b/pidl/lib/Parse/Pidl/Samba3/Template.pm @@ -47,7 +47,8 @@ sub Template($) #include \"includes.h\" #include \"ntdomain.h\" -#include \"../librpc/gen_ndr/srv_$name.h\" +#include \"librpc/gen_ndr/ndr_$name.h\" +#include \"librpc/gen_ndr/ndr_$name\_scompat.h\" "; @@ -80,6 +81,10 @@ $pad"."struct $fname *r) "; } } +$res .= +"/* include the generated boilerplate */ +#include \"librpc/gen_ndr/ndr_$name\_scompat.c\ +"; } -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 1edf9ecaf56 posix_acls.c: prefer capabilities over become_root via b250f25fe40 open.c: prefer capabilities over become_root via 4227b011f6a vfs_recycle.c: prefer capabilities over become_root via 92278418dc8 vfs_posix_eadb.c: prefer capabilities over become_root via 62464bd2db2 vfs_default.c: prefer capabilities over become_root via 0e3836e3961 vfs_acl_xattr.c: prefer capabilities over become_root via 12734848dc9 vfs_acl_common.c: prefer capabilities over become_root via 06e5c1e32ea nfs4_acls.c: prefer capabilities over become_root via 944cb51506a token_util.c: prefer capabilities over become_root via c1e2fbb1b9a dosmode.c: prefer use of capabilities at two places over become_root via a1738e8265d system.c: fall back to become_root if CAP_DAC_OVERRIDE isn't usable from 4481a67c1b2 smbd: fix close order of base_fsp and stream_fsp in smb_fname_fsp_destructor() https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 1edf9ecaf56f3312e199e633bff0804243042e33 Author: Björn Jacke Date: Fri Jun 17 07:28:01 2022 +0200 posix_acls.c: prefer capabilities over become_root Signed-off-by: Bjoern Jacke Reviewed-by: Christof Schmitt Autobuild-User(master): Björn Jacke Autobuild-Date(master): Thu Nov 16 22:39:05 UTC 2023 on atb-devel-224 commit b250f25fe407f9a6269b804382de4854501f2d86 Author: Björn Jacke Date: Fri Jun 17 07:27:38 2022 +0200 open.c: prefer capabilities over become_root Signed-off-by: Bjoern Jacke Reviewed-by: Christof Schmitt commit 4227b011f6ada97a4cd72a440ed887ffdb3f219e Author: Björn Jacke Date: Fri Jun 17 07:26:53 2022 +0200 vfs_recycle.c: prefer capabilities over become_root Signed-off-by: Bjoern Jacke Reviewed-by: Christof Schmitt commit 92278418dc885ed411f545e73c800ce93f858090 Author: Björn Jacke Date: Fri Jun 17 07:26:30 2022 +0200 vfs_posix_eadb.c: prefer capabilities over become_root Signed-off-by: Bjoern Jacke Reviewed-by: Christof Schmitt commit 62464bd2db2a95b1253364f4493bbb6770b73193 Author: Björn Jacke Date: Fri Jun 17 07:26:02 2022 +0200 vfs_default.c: prefer capabilities over become_root Signed-off-by: Bjoern Jacke Reviewed-by: Christof Schmitt commit 0e3836e3961f2b7c39173ce1023d3c92addef630 Author: Björn Jacke Date: Fri Jun 17 07:25:37 2022 +0200 vfs_acl_xattr.c: prefer capabilities over become_root Signed-off-by: Bjoern Jacke Reviewed-by: Christof Schmitt commit 12734848dc9901b932644139aaa7e3f78e55c8dc Author: Björn Jacke Date: Fri Jun 17 07:25:08 2022 +0200 vfs_acl_common.c: prefer capabilities over become_root Signed-off-by: Bjoern Jacke Reviewed-by: Christof Schmitt commit 06e5c1e32ea7907523cc19f021225e7541e2075f Author: Björn Jacke Date: Fri Jun 17 07:24:28 2022 +0200 nfs4_acls.c: prefer capabilities over become_root Signed-off-by: Bjoern Jacke Reviewed-by: Christof Schmitt commit 944cb51506a94084d7ab52ee044fe6f66e1aaeb9 Author: Björn Jacke Date: Fri Jun 17 07:22:57 2022 +0200 token_util.c: prefer capabilities over become_root Signed-off-by: Bjoern Jacke Reviewed-by: Christof Schmitt commit c1e2fbb1b9a7551becf5caa0f08d434edf9ad862 Author: Björn Jacke Date: Fri Nov 10 09:58:43 2023 +0100 dosmode.c: prefer use of capabilities at two places over become_root Signed-off-by: Bjoern Jacke Reviewed-by: Christof Schmitt commit a1738e8265dd256c5a1064482a6dfccbf9ca44f1 Author: Björn Jacke Date: Thu Nov 9 14:56:06 2023 +0100 system.c: fall back to become_root if CAP_DAC_OVERRIDE isn't usable BUG: https://bugzilla.samba.org/show_bug.cgi?id=15093 Signed-off-by: Bjoern Jacke Reviewed-by: Christof Schmitt --- Summary of changes: source3/auth/token_util.c| 4 ++-- source3/lib/system.c | 31 +-- source3/modules/nfs4_acls.c | 4 ++-- source3/modules/vfs_acl_common.c | 8 source3/modules/vfs_acl_xattr.c | 12 ++-- source3/modules/vfs_default.c| 4 ++-- source3/modules/vfs_posix_eadb.c | 4 ++-- source3/modules/vfs_recycle.c| 4 ++-- source3/smbd/dosmode.c | 8 source3/smbd/open.c | 12 ++-- source3/smbd/posix_acls.c| 40 11 files changed, 79 insertions(+), 52 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/auth/token_util.c b/source3/auth/token_util.c index 023ad7cbb02..a7ff9bd6c3f 100644 --- a/source3/auth/token_util.c +++ b/source3/auth/token_util.c @@ -699,7 +699,7 @@ NTSTATUS finalize_local_nt_token(struct security_token *result,
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 4481a67c1b2 smbd: fix close order of base_fsp and stream_fsp in
smb_fname_fsp_destructor()
from fe1d45cf1e9 s4:librpc: Add functions converting between bytes and
UTF‐16 strings
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 4481a67c1b20549a71d6c5132b637798a09f966d
Author: Ralph Boehme
Date: Thu Nov 16 10:50:32 2023 +0100
smbd: fix close order of base_fsp and stream_fsp in
smb_fname_fsp_destructor()
VFS modules like streams_xattr use the function fsp_is_alternate_stream()
on the
fsp to determine in an fsp is a stream, eg in streams_xattr_close(). If
fspo->base_fsp is arlready set to NULL, this won't work anymore.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15521
Signed-off-by: Ralph Boehme
Reviewed-by: Jeremy Allison
Autobuild-User(master): Jeremy Allison
Autobuild-Date(master): Thu Nov 16 18:31:17 UTC 2023 on atb-devel-224
---
Summary of changes:
source3/smbd/files.c | 24 +---
1 file changed, 13 insertions(+), 11 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/smbd/files.c b/source3/smbd/files.c
index 5da90480a67..11fee8caf24 100644
--- a/source3/smbd/files.c
+++ b/source3/smbd/files.c
@@ -408,6 +408,7 @@ static void destroy_fsp_smb_fname_link(struct
fsp_smb_fname_link **_link)
static int smb_fname_fsp_destructor(struct smb_filename *smb_fname)
{
struct files_struct *fsp = smb_fname->fsp;
+ struct files_struct *base_fsp = NULL;
NTSTATUS status;
int saved_errno = errno;
@@ -419,17 +420,7 @@ static int smb_fname_fsp_destructor(struct smb_filename
*smb_fname)
}
if (fsp_is_alternate_stream(fsp)) {
- struct files_struct *tmp_base_fsp = fsp->base_fsp;
-
- fsp_set_base_fsp(fsp, NULL);
-
- status = fd_close(tmp_base_fsp);
- if (!NT_STATUS_IS_OK(status)) {
- DBG_ERR("Closing fd for fsp [%s] failed: %s. "
- "Please check your filesystem!!!\n",
- fsp_str_dbg(fsp), nt_errstr(status));
- }
- file_free(NULL, tmp_base_fsp);
+ base_fsp = fsp->base_fsp;
}
status = fd_close(fsp);
@@ -441,6 +432,17 @@ static int smb_fname_fsp_destructor(struct smb_filename
*smb_fname)
file_free(NULL, fsp);
smb_fname->fsp = NULL;
+ if (base_fsp != NULL) {
+ base_fsp->stream_fsp = NULL;
+ status = fd_close(base_fsp);
+ if (!NT_STATUS_IS_OK(status)) {
+ DBG_ERR("Closing fd for base_fsp [%s] failed: %s. "
+ "Please check your filesystem!!!\n",
+ fsp_str_dbg(base_fsp), nt_errstr(status));
+ }
+ file_free(NULL, base_fsp);
+ }
+
errno = saved_errno;
return 0;
}
--
Samba Shared Repository
