The branch, master has been updated
via c93f33374b3 lib: Fix the build on solaris
from c2189932b4d vfs_btrfs: Log the correct fd value
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit c93f33374b3819184667f5d608215c701e9465b6
Author: Volker Lendecke <[email protected]>
Date: Mon Jan 12 18:21:33 2026 +0100
lib: Fix the build on solaris
Solaris does not define HAVE_POSIX_CAPABILITIES and does not have
cap_value_t. Confirmed by the reporter.
Signed-off-by: Volker Lendecke <[email protected]>
Reviewed-by: Stefan Metzmacher <[email protected]>
Autobuild-User(master): Volker Lendecke <[email protected]>
Autobuild-Date(master): Wed Jan 14 15:25:00 UTC 2026 on atb-devel-224
-----------------------------------------------------------------------
Summary of changes:
source3/lib/system.c | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/lib/system.c b/source3/lib/system.c
index e3dc53361ba..4aa3bef644a 100644
--- a/source3/lib/system.c
+++ b/source3/lib/system.c
@@ -607,18 +607,11 @@ static bool set_one_cap(cap_value_t val, bool enable)
return true;
}
-#else /* HAVE_POSIX_CAPABILITIES */
-
-static bool set_one_cap(cap_value_t val, bool enable)
-{
- return false;
-}
-
#endif /* HAVE_POSIX_CAPABILITIES */
void set_dmapi_capability(bool enable)
{
-#ifdef CAP_MKNOD
+#if defined(HAVE_POSIX_CAPABILITIES) && defined(CAP_MKNOD)
/*
* Ignore result, we'll get EACCES/EPERM later
*/
@@ -629,7 +622,7 @@ void set_dmapi_capability(bool enable)
void set_dac_override_capability(bool enable)
{
-#ifndef CAP_DAC_OVERRIDE
+#if !defined(HAVE_POSIX_CAPABILITIES) || !defined(CAP_DAC_OVERRIDE)
/*
* Use [un]become_root()
--
Samba Shared Repository
