[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 62ea6ae8c9d doc/vfs_ceph: document ceph:filesystem parameter via 5e49d4b4311 doc/vfs_ceph: update confusing default hint for ceph:user_id param via 98388e2bf0d vfs_ceph: add support to select ceph file system via e936e4d786a vfs_ceph: cache ceph mounts based on share configuration params via df073c7eedc vfs_ceph: split ceph mount logic into a new function from 5cb8805811e python: fix mutable default arguments https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 62ea6ae8c9d3341cb65185124225b55a4175e7ae Author: John Mulligan Date: Wed Feb 15 16:09:48 2023 -0500 doc/vfs_ceph: document ceph:filesystem parameter Document how the `ceph:filesystem` parameter allows one to select the cephfs file system to use for the share. Signed-off-by: John Mulligan Reviewed-by: Guenther Deschner Reviewed-by: Anoop C S Autobuild-User(master): Anoop C S Autobuild-Date(master): Fri Feb 24 05:37:57 UTC 2023 on atb-devel-224 commit 5e49d4b4311e9a7059bffd52152a6464d7da49e4 Author: John Mulligan Date: Wed Feb 15 16:04:07 2023 -0500 doc/vfs_ceph: update confusing default hint for ceph:user_id param Previously, the manpage hinted that the `ceph:user_id` parameter derived a default value from the process id. This implies that it referring to the PID but this is not what libcephfs actually does. Rather, this param is used to derive the `client.` authorization name ceph uses. This mistake probably originates in a comment in the libcephfs header. When I first started using the vfs_ceph module this confused me as I didn't know what to use to get access to my cluster. Eventually, after reading both docs and code I found that it does not use the pid but defaults to a value in the ceph client library (typically "admin"). Therefore, if you are using commands like `ceph fs authorize x client.foo` or `ceph auth get client.bar` to authorize a client you would supply smb.conf with `ceph:user_id = foo` or `ceph:user_id = bar` respectively. These entries then need corresponding entries in your ceph keyring file. Signed-off-by: John Mulligan Reviewed-by: Guenther Deschner Reviewed-by: Anoop C S commit 98388e2bf0d35405c974fa7d9671a36e055ed9a6 Author: John Mulligan Date: Wed Feb 15 15:21:43 2023 -0500 vfs_ceph: add support to select ceph file system Add a config parameter `ceph:filesystem` that will be passed to ceph_select_filesystem when provided. This allows shares on a single smbd to access multiple different cephfs file systems. The ceph_select_filesystem call was added as part of ceph 'nautilus' (v14), released on 2019-03-19 and EOLed on 2021-06-30. Since ceph 'pacific' (v16) multiple file system support is stable and ready to use. At the time of this commit, 'pacific' is the oldest actively supported version of ceph upstream. Since samba tests building on ubntu 18.04, which has ceph packages older than v14, a waf check for the function is added to test for the presence of ceph_select_filesystem and disable its use on these very old platforms. Signed-off-by: John Mulligan Reviewed-by: Guenther Deschner Reviewed-by: Anoop C S commit e936e4d786aeb76a8be82d82690c868f67f48d9e Author: John Mulligan Date: Wed Feb 15 15:12:12 2023 -0500 vfs_ceph: cache ceph mounts based on share configuration params Previously, the vfs_ceph module kept one global cached mount. This makes it impossible to support multiple ceph clusters or file systems. Add a mount cache in a similar fashion to the connection cache found in the vfs_glusterfs module. The vfs_ceph cache uses a single "cookie" value, a unique string based on config params, to ID the cache entry. Shares that produce the same cookie will share cephfs mount objects and increment a counter when multiple shares are using the same cache entry. Signed-off-by: John Mulligan Reviewed-by: Guenther Deschner Reviewed-by: Anoop C S commit df073c7eedc61fe1c95b2e26a18915b2a0c77552 Author: John Mulligan Date: Wed Feb 15 14:22:00 2023 -0500 vfs_ceph: split ceph mount logic into a new function This new function is entirely dedicated to just setting up a libcephfs mount. Handling the cmount global and samba connection params remains in cephwrap_connect. This change will later be used to avoid a single global cached connection and add improved connection handling. Signed-off-by: John Mulligan Reviewed-by: Guenther Deschner Reviewed-by: Anoop C S --- Summary of changes: docs-xml/manpages/vfs_ceph.8.xml | 19 ++-
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 5cb8805811e python: fix mutable default arguments via e7c87b1d9bd selftest: source3: fix mutable default arguments via c9535526f08 selftest: source4: fix mutable default arguments via 92732858860 buildtools: fix mutable default arguments via 4717a58f6ce selftest: fix mutable default arguments via f582caad831 selftest: fix typo in test comment via 70fe6020b5b selftest: fix scope and attrs not passed to search via 8a7a779df5d selftest: fix invalid loop variables uid and gid via 3687ab318a9 selftest: fix flapping samba-tool drs showrepl test via 1368e359b2a selftest: make two samba-tool drs tests generic via 2388db932bb selftest: specify env rather than picking it up from loop via ecb628dd485 selftest: remove unused import via 739ebf46c4c selftest: pep8: too many blank lines via e9db5297673 selftest: Fix some typos in selftest tests.py from 5c051eacd42 selftests: Make sure print queue is empty before printing_var_exp test ends https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 5cb8805811ee5e5a880c1c2d42f4fd9b195abe75 Author: Rob van der Linde Date: Thu Feb 23 15:54:37 2023 +1300 python: fix mutable default arguments Signed-off-by: Rob van der Linde Reviewed-by: Andrew Bartlett Reviewed-by: Joseph Sutton Autobuild-User(master): Andrew Bartlett Autobuild-Date(master): Thu Feb 23 23:33:46 UTC 2023 on atb-devel-224 commit e7c87b1d9bd10280bff69f1acaf292364b79d496 Author: Rob van der Linde Date: Thu Feb 23 15:54:21 2023 +1300 selftest: source3: fix mutable default arguments Signed-off-by: Rob van der Linde Reviewed-by: Andrew Bartlett Reviewed-by: Joseph Sutton commit c9535526f08141fc5853f5a198bc76f0184e66fe Author: Rob van der Linde Date: Thu Feb 23 15:53:58 2023 +1300 selftest: source4: fix mutable default arguments Signed-off-by: Rob van der Linde Reviewed-by: Andrew Bartlett Reviewed-by: Joseph Sutton commit 92732858860072f98d358bb89ace00856b469bfa Author: Rob van der Linde Date: Thu Feb 23 15:52:21 2023 +1300 buildtools: fix mutable default arguments Signed-off-by: Rob van der Linde Reviewed-by: Andrew Bartlett Reviewed-by: Joseph Sutton commit 4717a58f6ceb40f2fb3d990191f86d18283146b8 Author: Rob van der Linde Date: Thu Feb 23 15:51:48 2023 +1300 selftest: fix mutable default arguments Signed-off-by: Rob van der Linde Reviewed-by: Andrew Bartlett Reviewed-by: Joseph Sutton commit f582caad83119b8c928cb3b26e907d889af30923 Author: Rob van der Linde Date: Thu Feb 23 15:50:53 2023 +1300 selftest: fix typo in test comment Signed-off-by: Rob van der Linde Reviewed-by: Andrew Bartlett Reviewed-by: Joseph Sutton commit 70fe6020b5b6669de6cd12572a18c5ab49537d65 Author: Rob van der Linde Date: Thu Feb 23 15:49:11 2023 +1300 selftest: fix scope and attrs not passed to search Signed-off-by: Rob van der Linde Reviewed-by: Andrew Bartlett Reviewed-by: Joseph Sutton commit 8a7a779df5df40cd4b8003b9082cb2e3f22545c9 Author: Rob van der Linde Date: Thu Feb 23 15:46:43 2023 +1300 selftest: fix invalid loop variables uid and gid Signed-off-by: Rob van der Linde Reviewed-by: Andrew Bartlett Reviewed-by: Joseph Sutton commit 3687ab318a9553883d8c0d1214e2d49b83ec91ba Author: Rob van der Linde Date: Thu Feb 23 16:56:30 2023 +1300 selftest: fix flapping samba-tool drs showrepl test Test should have been using "schema_pair_dc", it was picking this up from the variable env in the loop above it. However, it was hardcoded to use promoted_dc. BUG: https://bugzilla.samba.org/show_bug.cgi?id=15316 Signed-off-by: Rob van der Linde Reviewed-by: Andrew Bartlett Reviewed-by: Joseph Sutton commit 1368e359b2a75b6b683aff274b2b2084f3cd469b Author: Rob van der Linde Date: Thu Feb 23 16:56:07 2023 +1300 selftest: make two samba-tool drs tests generic BUG: https://bugzilla.samba.org/show_bug.cgi?id=15316 Signed-off-by: Rob van der Linde Reviewed-by: Andrew Bartlett Reviewed-by: Joseph Sutton commit 2388db932bb5a356a070f8f2f8550434e2d68730 Author: Rob van der Linde Date: Thu Feb 23 16:18:42 2023 +1300 selftest: specify env rather than picking it up from loop Signed-off-by: Rob van der Linde Reviewed-by: Andrew Bartlett Reviewed-by: Joseph Sutton commit ecb628dd4855132850d6972333c7d56c9fcaa363 Author: Rob van der Linde Date: Thu Feb 23 11:54:16 2023 +1300 selftest: remove unused import Signed-off-by: Rob van der Linde Reviewed-by: Andrew Bartlett Reviewed-by: Joseph Sutton commit 739ebf46c4c7585525c4f03b78e864e112948642
[SCM] Socket Wrapper Repository - branch master updated
The branch, master has been updated
via 97fe09e cmake: Fix cmocka >= 1.1.6 find_package() in CONFIG mode
from 3c945e0 Bump version to 1.4.0
https://git.samba.org/?p=socket_wrapper.git;a=shortlog;h=master
- Log -
commit 97fe09e583f6e2ef94623c872e0c56bcd8817303
Author: Andreas Schneider
Date: Fri Feb 17 17:51:27 2023 +0100
cmake: Fix cmocka >= 1.1.6 find_package() in CONFIG mode
Signed-off-by: Andreas Schneider
Reviewed-by: Pavel Filipenský
---
Summary of changes:
tests/CMakeLists.txt | 5 +
1 file changed, 5 insertions(+)
Changeset truncated at 500 lines:
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 6c3aae9..3748461 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -7,6 +7,11 @@ include_directories(
${CMOCKA_INCLUDE_DIR}
)
+# Required for cmocka >= 1.1.6
+if (TARGET cmocka::cmocka)
+set(CMOCKA_LIBRARY cmocka::cmocka)
+endif()
+
set(TORTURE_LIBRARY torture)
# RFC862 echo server
--
Socket Wrapper Repository
[SCM] Samba Shared Repository - branch v4-17-test updated
The branch, v4-17-test has been updated
via f4556250b87 lib:util: File descriptor being closed repeatedly.
from 0b8713e342c vfs_ceph: use fsp_get_pathref_fd in ceph fstatat and
close vfs calls
https://git.samba.org/?p=samba.git;a=shortlog;h=v4-17-test
- Log -
commit f4556250b87cd166c7516b7ebe28e2a6ca09eb7f
Author: baixiangcpp
Date: Fri Feb 10 11:01:47 2023 +0800
lib:util: File descriptor being closed repeatedly.
In file_load()/file_lines_load(), the file's fd is obtained using
open(), and in fd_load() the fd is converted to a FILE* using
fdopen(). However, after fclose(), the fd is closed again using
close().
Bug: https://bugzilla.samba.org/show_bug.cgi?id=15311
Signed-off-by: baixiangcpp baixiang...@gmail.com
Reviewed-by: Volker Lendecke
Reviewed-by: Ralph Boehme
Autobuild-User(master): Volker Lendecke
Autobuild-Date(master): Thu Feb 16 12:13:05 UTC 2023 on atb-devel-224
(cherry picked from commit 206dcf7d426e9e85c896c54839008e194d9a2824)
Autobuild-User(v4-17-test): Jule Anger
Autobuild-Date(v4-17-test): Thu Feb 23 13:37:27 UTC 2023 on sn-devel-184
---
Summary of changes:
lib/util/util_file.c | 9 -
1 file changed, 8 insertions(+), 1 deletion(-)
Changeset truncated at 500 lines:
diff --git a/lib/util/util_file.c b/lib/util/util_file.c
index af90e4a7621..fa5abadedec 100644
--- a/lib/util/util_file.c
+++ b/lib/util/util_file.c
@@ -175,13 +175,20 @@ _PUBLIC_ char *fd_load(int fd, size_t *psize, size_t
maxsize, TALLOC_CTX *mem_ct
size_t size = 0;
size_t chunk = 1024;
int err;
+ int fd_dup;
if (maxsize == 0) {
maxsize = SIZE_MAX;
}
- file = fdopen(fd, "r");
+ fd_dup = dup(fd);
+ if (fd_dup == -1) {
+ return NULL;
+ }
+
+ file = fdopen(fd_dup, "r");
if (file == NULL) {
+ close(fd_dup);
return NULL;
}
--
Samba Shared Repository
